summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-06 17:56:47 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-06 17:56:47 -0800
commit8d9aec9278f2113e239a32e393aeca7eefd64fbf (patch)
treec50dfd9859aa0fad2f7aff6574c32587dcce3045 /indra/newview/llviewerwindow.cpp
parent50615ba69c94441c99f21f861cf0290972162998 (diff)
parent0a21efc7abc62511d1ea789bdb47309a6ed1d72e (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-xindra/newview/llviewerwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4e37a9043d..3b2292c04d 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -563,6 +563,9 @@ public:
addText(xpos, ypos, llformat("%d Render Calls", gPipeline.mBatchCount));
ypos += y_inc;
+ addText(xpos, ypos, llformat("%d/%d Objects Active", gObjectList.getNumActiveObjects(), gObjectList.getNumObjects()));
+ ypos += y_inc;
+
addText(xpos, ypos, llformat("%d Matrix Ops", gPipeline.mMatrixOpCount));
ypos += y_inc;