SL-731, SL-779 - more diagnostics for DebugAnimatedObjects, fixed a problem with recursiveMarkForUpdate

1 files changed, 18 insertions, 3 deletions

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index fab95ab1d8..51dc7d7de1 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -227,6 +227,7 @@ void LLControlAvatar::updateDebugText()
         getAnimatedVolumes(volumes);
         S32 animated_volume_count = volumes.size();
         std::string active_string;
+        std::string type_string;
         std::string lod_string;
         S32 total_tris = 0;
         S32 total_verts = 0;
@@ -248,16 +249,31 @@ void LLControlAvatar::updateDebugText()
                 {
                     active_string += "S";
                 }
+                if (volp->isRiggedMesh())
+                {
+                    // Rigged/animateable mesh
+                    type_string += "R";
+                }
+                else if (volp->isMesh())
+                {
+                    // Static mesh
+                    type_string += "M";
+                }
+                else
+                {
+                    // Any other prim
+                    type_string += "P";
+                }
             }
             else
             {
                 active_string += "-";
+                type_string += "-";
             }
         }
         addDebugText(llformat("CAV obj %d anim %d active %s",
                               total_linkset_count, animated_volume_count, active_string.c_str()));
-
-        addDebugText(llformat("lod %s",lod_string.c_str()));
+        addDebugText(llformat("types %s lods %s", type_string.c_str(), lod_string.c_str()));
         addDebugText(llformat("tris %d verts %d", total_tris, total_verts));
         //addDebugText(llformat("anim time %.1f (step %f factor %f)", 
         //                      mMotionController.getAnimTime(),
@@ -329,7 +345,6 @@ void LLControlAvatar::updateAnimations()
     }
     mSignaledAnimations = anims;
 
-    LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
     processAnimationStateChanges();
 }