summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-06 12:28:41 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-06 12:28:41 -0800
commitb1035e2713023a606960986d6f1b93cfa7324ae4 (patch)
tree75acb3209ca7c8fed5ce774339b6f3a2d1b603d5 /indra/newview/llviewerwindow.cpp
parentabcdc25c29d6abf4be6e347aca817f39d4057ac2 (diff)
parentbf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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 1605a910c9..5d5a29aa77 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;