summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-02 17:56:35 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-02 17:56:35 -0700
commit3b39ec165aa837d02bf1bf57ff8f3aab3229659c (patch)
treefd718fca322b7c4419a3eaee4a6940f54f8bd659 /indra/newview/llviewerwindow.cpp
parent6e2b3527cc95b92bf136b65fd2ee344d4c879faa (diff)
parent1f305e8624e130683fc5d8fceac7a8159515376b (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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;