From 0261f5029823886af08941688ca29185a6ce9ebc Mon Sep 17 00:00:00 2001 From: tosh Date: Tue, 21 May 2013 23:13:03 +0200 Subject: [PATCH] merge up --- libraries/avatars/src/AvatarData.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 5aaae9f3ad..e74cee6408 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -14,10 +14,8 @@ #include #include "AvatarData.h" -#include "avatars_Log.h" using namespace std; -using avatars_lib::printLog; int packFloatAngleToTwoByte(unsigned char* buffer, float angle) { const float ANGLE_CONVERSION_RATIO = (std::numeric_limits::max() / 360.0); @@ -238,4 +236,4 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { _wantDelta = oneAtBit(wantItems,WANT_DELTA_AT_BIT); return sourceBuffer - startPosition; -} \ No newline at end of file +}