From 274989935d94c5f61352aa17a54b1fc62f5e5d19 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 14 Jan 2014 16:09:12 -0800
Subject: [PATCH] resolve conflicts on merge with upstream master

---
 interface/src/avatar/Avatar.cpp         | 4 ++--
 interface/src/avatar/MyAvatar.cpp       | 2 +-
 libraries/avatars/src/AvatarData.cpp    | 4 ++--
 libraries/voxels/src/VoxelTreeElement.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 interface/src/avatar/Avatar.cpp

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
old mode 100755
new mode 100644
index fdace5becb..aae34cb358
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -146,8 +146,8 @@ glm::quat Avatar::getWorldAlignedOrientation () const {
 }
 
 void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
-    if (_scale != _newScale) {
-        setScale(_newScale);
+    if (_scale != _targetScale) {
+        setScale(_targetScale);
     }
     
     // copy velocity so we can use it later for acceleration
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 9ba35a9f80..04f320f4c2 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -88,7 +88,7 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
     }
 
     if (_scale != _newScale) {
-        float scale = (1.f - SMOOTHING_RATIO) * _scale + SMOOTHING_RATIO * _newScale;
+        float scale = (1.f - SMOOTHING_RATIO) * _scale + SMOOTHING_RATIO * _targetScale;
         setScale(scale);
         Application::getInstance()->getCamera()->setScale(scale);
     }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index ff060f3e0f..4647ad5d35 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -29,7 +29,7 @@ AvatarData::AvatarData(Node* owningNode) :
     _bodyYaw(-90.0),
     _bodyPitch(0.0),
     _bodyRoll(0.0),
-    _newScale(1.0f),
+    _targetScale(1.0f),
     _handState(0),
     _keyState(NO_KEY_DOWN),
     _isChatCirclingEnabled(false),
@@ -75,7 +75,7 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _bodyRoll);
 
     // Body scale
-    destinationBuffer += packFloatRatioToTwoByte(destinationBuffer, _newScale);
+    destinationBuffer += packFloatRatioToTwoByte(destinationBuffer, _targetScale);
 
     // Head rotation (NOTE: This needs to become a quaternion to save two bytes)
     destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->_yaw);
diff --git a/libraries/voxels/src/VoxelTreeElement.h b/libraries/voxels/src/VoxelTreeElement.h
index d30007aca1..1eee7e4a5b 100644
--- a/libraries/voxels/src/VoxelTreeElement.h
+++ b/libraries/voxels/src/VoxelTreeElement.h
@@ -92,4 +92,4 @@ protected:
 };
 
 
-#endif /* defined(__hifi__VoxelTreeElement__) */
+#endif /* defined(__hifi__VoxelTreeElement__) */
\ No newline at end of file