From eee41bc41e2c9380ddc0d3554eb3037e5fa4dd08 Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Tue, 12 Feb 2019 13:46:21 -0800 Subject: [PATCH] Revert "Pack all non-instanced traits" This reverts commit 5b7d7b88331e0d5607cb6676b52b5056d7846cca. --- libraries/avatars/src/ClientTraitsHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/avatars/src/ClientTraitsHandler.cpp b/libraries/avatars/src/ClientTraitsHandler.cpp index 3e188afbdf..bcbe5308c7 100644 --- a/libraries/avatars/src/ClientTraitsHandler.cpp +++ b/libraries/avatars/src/ClientTraitsHandler.cpp @@ -107,10 +107,11 @@ int ClientTraitsHandler::sendChangedTraitsToMixer() { if (initialSend || *simpleIt == Updated) { if (traitType == AvatarTraits::SkeletonModelURL) { + bytesWritten += _owningAvatar->packTrait(traitType, *traitsPacketList); + // keep track of our skeleton version in case we get an override back _currentSkeletonVersion = _currentTraitVersion; } - bytesWritten += _owningAvatar->packTrait(traitType, *traitsPacketList); } ++simpleIt;