From e8885332f2583af6fdb6e230ed0feb9d3fcd95f6 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 23 Oct 2013 11:39:30 -0700
Subject: [PATCH] Code review fixes.

---
 interface/src/DataServerClient.cpp     | 14 +++++++-------
 interface/src/avatar/SkeletonModel.cpp |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/interface/src/DataServerClient.cpp b/interface/src/DataServerClient.cpp
index 6fe864d13a..b3d8592027 100644
--- a/interface/src/DataServerClient.cpp
+++ b/interface/src/DataServerClient.cpp
@@ -131,8 +131,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
             if (keyList[i] == DataServerKey::FaceMeshURL) {
                 
                 if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) {
-                    qDebug("Changing user's face model URL to %s\n", valueList[0].toLocal8Bit().constData());
-                    Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[0]));
+                    qDebug("Changing user's face model URL to %s\n", valueList[i].toLocal8Bit().constData());
+                    Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[i]));
                 } else {
                     // mesh URL for a UUID, find avatar in our list
                     NodeList* nodeList = NodeList::getInstance();
@@ -142,7 +142,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
                             
                             if (avatar->getUUID() == userUUID) {
                                 QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(),
-                                    "setURL", Q_ARG(QUrl, QUrl(valueList[0])));
+                                    "setURL", Q_ARG(QUrl, QUrl(valueList[i])));
                             }
                         }
                     }
@@ -150,8 +150,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
             } else if (keyList[i] == DataServerKey::SkeletonURL) {
                 
                 if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) {
-                    qDebug("Changing user's skeleton URL to %s\n", valueList[0].toLocal8Bit().constData());
-                    Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[0]));
+                    qDebug("Changing user's skeleton URL to %s\n", valueList[i].toLocal8Bit().constData());
+                    Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[i]));
                 } else {
                     // skeleton URL for a UUID, find avatar in our list
                     NodeList* nodeList = NodeList::getInstance();
@@ -161,7 +161,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
                             
                             if (avatar->getUUID() == userUUID) {
                                 QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL",
-                                    Q_ARG(QUrl, QUrl(valueList[0])));
+                                    Q_ARG(QUrl, QUrl(valueList[i])));
                             }
                         }
                     }
@@ -187,7 +187,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
                 
             } else if (keyList[i] == DataServerKey::UUID) {
                 // this is the user's UUID - set it on the profile
-                Application::getInstance()->getProfile()->setUUID(valueList[0]);
+                Application::getInstance()->getProfile()->setUUID(valueList[i]);
             }
         }
     }
diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp
index 8c2bd675e5..9ccc63d587 100644
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@@ -12,8 +12,7 @@
 #include "SkeletonModel.h"
 
 SkeletonModel::SkeletonModel(Avatar* owningAvatar) :
-    _owningAvatar(owningAvatar)
-{
+    _owningAvatar(owningAvatar) {
 }
 
 void SkeletonModel::simulate(float deltaTime) {