Showing the changes to interface/src/DataServerClient.cpp (1 of 44 files). Show all
Unified · Split
| @@ -144,14 +144,14 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 143 unmodified lines | |||
| 144 | Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[i])); | 144 | Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[i])); |
| 145 | } else { | 145 | } else { |
| 146 | // mesh URL for a UUID, find avatar in our list | 146 | // mesh URL for a UUID, find avatar in our list |
| 147 | NodeList* nodeList = NodeList::getInstance(); | 147 | |
| 148 | for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { | 148 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { |
| 149 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { | 149 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { |
| 150 | Avatar* avatar = (Avatar *) node->getLinkedData(); | 150 | Avatar* avatar = (Avatar *) node->getLinkedData(); |
| 151 | 151 | ||
| 152 | if (avatar->getUUID() == userUUID) { | 152 | if (avatar->getUUID() == userUUID) { |
| 153 | QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(), | 153 | QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(), |
| 154 | "setURL", Q_ARG(QUrl, QUrl(valueList[i]))); | 154 | "setURL", Q_ARG(QUrl, QUrl(valueList[i]))); |
| 155 | } | 155 | } |
| 156 | } | 156 | } |
| 157 | } | 157 | } |
| @@ -163,14 +163,13 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 5 unmodified lines | |||
| 163 | Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[i])); | 163 | Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[i])); |
| 164 | } else { | 164 | } else { |
| 165 | // skeleton URL for a UUID, find avatar in our list | 165 | // skeleton URL for a UUID, find avatar in our list |
| 166 | NodeList* nodeList = NodeList::getInstance(); | 166 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { |
| 167 | for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { | ||
| 168 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { | 167 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { |
| 169 | Avatar* avatar = (Avatar *) node->getLinkedData(); | 168 | Avatar* avatar = (Avatar *) node->getLinkedData(); |
| 170 | 169 | ||
| 171 | if (avatar->getUUID() == userUUID) { | 170 | if (avatar->getUUID() == userUUID) { |
| 172 | QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL", | 171 | QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL", |
| 173 | Q_ARG(QUrl, QUrl(valueList[i]))); | 172 | Q_ARG(QUrl, QUrl(valueList[i]))); |
| 174 | } | 173 | } |
| 175 | } | 174 | } |
| 176 | } | 175 | } |