diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-01 14:15:34 +0000 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-01 14:15:34 +0000 |
commit | 0d2d6b42baa4fc6d253c5499324ffe5572676d87 (patch) | |
tree | 4583dbbd90ca376c7517126758fffdeccfc23dd6 /indra/newview/llviewermessage.cpp | |
parent | 5c7f27562dc1ef449f23be5ab747a19c23eec361 (diff) |
SL-704, SL-759 - support for impostoring of animated objects, comment and code cleanup
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 24af491391..bfaad30fc1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5086,32 +5086,32 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data) LLViewerObject *objp = gObjectList.findObject(uuid); if (!objp) { - LL_WARNS("Messaging") << "AXON Received animation state for unknown object" << uuid << LL_ENDL; + LL_WARNS("Messaging") << "Received animation state for unknown object" << uuid << LL_ENDL; return; } LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp); if (!volp) { - LL_WARNS("Messaging") << "AXON Received animation state for non-volume object" << uuid << LL_ENDL; + LL_WARNS("Messaging") << "Received animation state for non-volume object" << uuid << LL_ENDL; return; } if (!volp->isAnimatedObject()) { - LL_WARNS("Messaging") << "AXON Received animation state for non-animated object" << uuid << LL_ENDL; + LL_WARNS("Messaging") << "Received animation state for non-animated object" << uuid << LL_ENDL; return; } LLControlAvatar *avatarp = volp->getControlAvatar(); if (!avatarp) { - LL_WARNS("Messaging") << "AXON no control avatar, ignoring" << LL_ENDL; + LL_WARNS("Messaging") << "Received animation request for object with no control avatar, ignoring" << LL_ENDL; return; } S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList); - LL_DEBUGS("AXON") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL; + LL_DEBUGS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL; #if 1 // Here we go into skinned mode once, the first time we get an @@ -5156,8 +5156,8 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data) mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i); mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i); volp->mObjectSignaledAnimations[animation_id] = anim_sequence_id; - LL_DEBUGS("AXON") << "got object animation request for object " - << uuid << " animation id " << animation_id << LL_ENDL; + LL_DEBUGS("AnimatedObjects") << "got object animation request for object " + << uuid << " animation id " << animation_id << LL_ENDL; } avatarp->updateAnimations(); |