merge

1 files changed, 15 insertions, 1 deletions

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 8dfc2e81dc..d458e2951b 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -212,11 +212,18 @@ void LLControlAvatar::updateDebugText()
         getAnimatedVolumes(volumes);
         S32 animated_volume_count = volumes.size();
         std::string active_string;
+        std::string lod_string;
+        S32 total_tris = 0;
+        S32 total_verts = 0;
         for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
              it != volumes.end(); ++it)
         {
             LLVOVolume *volp = *it;
-            if (volp && volp->mDrawable)
+            S32 verts = 0;
+            total_tris += volp->getTriangleCount(&verts);
+            total_verts += verts;
+            lod_string += llformat("%d",volp->getLOD());
+                        if (volp && volp->mDrawable)
             {
                 if (volp->mDrawable->isActive())
                 {
@@ -248,6 +255,13 @@ void LLControlAvatar::updateDebugText()
         }
 #endif
 
+        addDebugText(llformat("lod %s",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(),
+        //                      mMotionController.getTimeStep(), 
+        //                      mMotionController.getTimeFactor()));
+        
     }
 
     LLVOAvatar::updateDebugText();