Merge pull request #885 from ey6es/master

Fix for network crash.
This commit is contained in:
Andrzej Kapolka 2013-08-22 13:53:19 -07:00
commit e67aee4b74

View file

@ -801,9 +801,10 @@ void Avatar::getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, gl
int Avatar::parseData(unsigned char* sourceBuffer, int numBytes) {
// change in position implies movement
glm::vec3 oldPosition = _position;
AvatarData::parseData(sourceBuffer, numBytes);
int bytesRead = AvatarData::parseData(sourceBuffer, numBytes);
const float MOVE_DISTANCE_THRESHOLD = 0.001f;
_moving = glm::distance(oldPosition, _position) > MOVE_DISTANCE_THRESHOLD;
return bytesRead;
}
void Avatar::saveData(QSettings* set) {