diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-05-02 21:33:46 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-05-02 21:33:46 +0100 |
commit | 0608bce54bc818774a38403e2252e25fb54d7ed6 (patch) | |
tree | 0e2be3bcf917cf8d142b81cfdff91f6e09c8ee1d | |
parent | 0dc944bd4a9aa48582ee0196a55c2759806acc64 (diff) |
MAINT-8608 - more detailed logging of issues with object animation requests.
-rw-r--r-- | indra/newview/llviewermessage.cpp | 17 | ||||
-rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 16d306f997..05494b74f7 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5075,6 +5075,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) } } +// AXON make logging less spammy after issues resolved, before release. void process_object_animation(LLMessageSystem *mesgsys, void **user_data) { LLUUID animation_id; @@ -5083,25 +5084,25 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data) mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid); - LL_DEBUGS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL; + LL_INFOS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL; LLViewerObject *objp = gObjectList.findObject(uuid); if (!objp) { - LL_WARNS("Messaging") << "Received animation state for unknown object " << uuid << LL_ENDL; + LL_WARNS("AnimatedObjects") << "Received animation state for unknown object " << uuid << LL_ENDL; return; } LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp); if (!volp) { - LL_WARNS("Messaging") << "Received animation state for non-volume object " << uuid << LL_ENDL; + LL_WARNS("AnimatedObjects") << "Received animation state for non-volume object " << uuid << LL_ENDL; return; } if (!volp->isAnimatedObject()) { - LL_WARNS("Messaging") << "Received animation state for non-animated object " << uuid << LL_ENDL; + LL_WARNS("AnimatedObjects") << "Received animation state for non-animated object " << uuid << LL_ENDL; return; } @@ -5109,12 +5110,12 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data) LLControlAvatar *avatarp = volp->getControlAvatar(); if (!avatarp) { - LL_WARNS("Messaging") << "Received animation request for object with no control avatar, ignoring" << LL_ENDL; + LL_WARNS("AnimatedObjects") << "Received animation request for object with no control avatar, ignoring " << uuid << LL_ENDL; return; } S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList); - LL_DEBUGS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL; + LL_INFOS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << " uuid " << uuid << LL_ENDL; if (!avatarp->mPlaying) { @@ -5133,8 +5134,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("AnimatedObjects") << "got object animation request for object " - << uuid << " animation id " << animation_id << LL_ENDL; + LL_INFOS("AnimatedObjects") << "added object animation request for object " + << uuid << " animation id " << animation_id << LL_ENDL; } avatarp->updateAnimations(); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 91ef64cb4b..e08379af09 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3696,7 +3696,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const { if (isAnimatedObject() && isRiggedMesh()) { - // AXON Scaling here is to make animated object vs + // Scaling here is to make animated object vs // non-animated object ARC proportional to the // corresponding calculations for streaming cost. num_triangles = (ANIMATED_OBJECT_COST_PER_KTRI * 0.001 * costs.getEstTrisForStreamingCost())/0.06; |