summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-01 11:29:03 -0500
committerDave Parks <davep@lindenlab.com>2012-11-01 11:29:03 -0500
commit9ff687218af74000c7281e0579d17ef2930c6e33 (patch)
tree36c265c97f6b4dff503223412d993d22d961f511 /indra/newview/llviewerwindow.cpp
parente4df3c1ca875d396240f75c1af8db20f4f7300bf (diff)
parent44a024d2f5d4467372d0d2082a83449696b22948 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index af2eec9ba8..98ea923272 100644
--- 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;