summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-11-02 16:48:56 -0400
committerOz Linden <oz@lindenlab.com>2012-11-02 16:48:56 -0400
commit02afdef3698ae17ef19ea17956c285d2523b142d (patch)
tree87b690edc66e0e43f4910880205e01630febb998 /indra/newview/llviewerwindow.cpp
parent1a872c7bf8b6aaf3d40e2c51b7f5fabebaba62de (diff)
parent1f305e8624e130683fc5d8fceac7a8159515376b (diff)
merge back fixes from 3.4.1-beta12
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 1798d554b9..c3af0f6a51 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;