From 45f93f5fbbd30cef52e61f6681e8af4795e64260 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 15 Oct 2013 10:19:52 -0700
Subject: add cached object count stat

---
 indra/newview/llworld.cpp                            | 3 +++
 indra/newview/skins/default/xui/en/floater_stats.xml | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index f283cdb4b8..e4e0a745ce 100755
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -661,6 +661,8 @@ void LLWorld::updateVisibilities()
 	LLViewerCamera::getInstance()->setFar(cur_far_clip);
 }
 
+static LLTrace::SampleStatHandle<> sNumActiveCachedObjects("numactivecachedobjects", "Number of objects loaded from cache");
+
 void LLWorld::updateRegions(F32 max_update_time)
 {
 	if(LLViewerCamera::getInstance()->isChanged())
@@ -682,6 +684,7 @@ void LLWorld::updateRegions(F32 max_update_time)
 	{
 		mNumOfActiveCachedObjects += (*iter)->getNumOfActiveCachedObjects();
 	}
+	sample(sNumActiveCachedObjects, mNumOfActiveCachedObjects);
 }
 
 void LLWorld::clearAllVisibleObjects()
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 6c776907f5..bee570d5d0 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -62,7 +62,10 @@
           <stat_bar name="objs"
                     label="Total Objects"
                     stat="numobjectsstat"/>
-          <stat_bar name="newobjs"
+					<stat_bar name="objs"
+                    label="Cached Objects"
+                    stat="numactivecachedobjects"/>
+					<stat_bar name="newobjs"
                     label="New Objects"
                     stat="numnewobjectsstat"/>
           <stat_bar name="object_cache_hits"
-- 
cgit v1.2.3