Showing the changes to interface/src/DataServerClient.cpp (1 of 2 files). Show all
Unified · Split
| @@ -131,8 +131,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 130 unmodified lines | |||
| 131 | if (keyList[i] == DataServerKey::FaceMeshURL) { | 131 | if (keyList[i] == DataServerKey::FaceMeshURL) { |
| 132 | 132 | ||
| 133 | if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { | 133 | if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { |
| 134 | qDebug("Changing user's face model URL to %s\n", valueList[0].toLocal8Bit().constData()); | 134 | qDebug("Changing user's face model URL to %s\n", valueList[i].toLocal8Bit().constData()); |
| 135 | Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[0])); | 135 | Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[i])); |
| 136 | } else { | 136 | } else { |
| 137 | // mesh URL for a UUID, find avatar in our list | 137 | // mesh URL for a UUID, find avatar in our list |
| 138 | NodeList* nodeList = NodeList::getInstance(); | 138 | NodeList* nodeList = NodeList::getInstance(); |
| @@ -142,7 +142,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 3 unmodified lines | |||
| 142 | 142 | ||
| 143 | if (avatar->getUUID() == userUUID) { | 143 | if (avatar->getUUID() == userUUID) { |
| 144 | QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(), | 144 | QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(), |
| 145 | "setURL", Q_ARG(QUrl, QUrl(valueList[0]))); | 145 | "setURL", Q_ARG(QUrl, QUrl(valueList[i]))); |
| 146 | } | 146 | } |
| 147 | } | 147 | } |
| 148 | } | 148 | } |
| @@ -150,8 +150,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 1 unmodified line | |||
| 150 | } else if (keyList[i] == DataServerKey::SkeletonURL) { | 150 | } else if (keyList[i] == DataServerKey::SkeletonURL) { |
| 151 | 151 | ||
| 152 | if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { | 152 | if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { |
| 153 | qDebug("Changing user's skeleton URL to %s\n", valueList[0].toLocal8Bit().constData()); | 153 | qDebug("Changing user's skeleton URL to %s\n", valueList[i].toLocal8Bit().constData()); |
| 154 | Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[0])); | 154 | Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[i])); |
| 155 | } else { | 155 | } else { |
| 156 | // skeleton URL for a UUID, find avatar in our list | 156 | // skeleton URL for a UUID, find avatar in our list |
| 157 | NodeList* nodeList = NodeList::getInstance(); | 157 | NodeList* nodeList = NodeList::getInstance(); |
| @@ -161,7 +161,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 3 unmodified lines | |||
| 161 | 161 | ||
| 162 | if (avatar->getUUID() == userUUID) { | 162 | if (avatar->getUUID() == userUUID) { |
| 163 | QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL", | 163 | QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL", |
| 164 | Q_ARG(QUrl, QUrl(valueList[0]))); | 164 | Q_ARG(QUrl, QUrl(valueList[i]))); |
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | } | 167 | } |
| @@ -187,7 +187,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 19 unmodified lines | |||
| 187 | 187 | ||
| 188 | } else if (keyList[i] == DataServerKey::UUID) { | 188 | } else if (keyList[i] == DataServerKey::UUID) { |
| 189 | // this is the user's UUID - set it on the profile | 189 | // this is the user's UUID - set it on the profile |
| 190 | Application::getInstance()->getProfile()->setUUID(valueList[0]); | 190 | Application::getInstance()->getProfile()->setUUID(valueList[i]); |
| 191 | } | 191 | } |
| 192 | } | 192 | } |
| 193 | } | 193 | } |