From 05ec5ca3d592ed7c730026582a2573d04c6e4c16 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 19 Sep 2013 20:05:53 -0700
Subject: BUILDFIX: forgot forward declaration better overrides for memclaim
 and memdisclaim of sizes added occlusion stats to stats floater stats now
 render range instead of mean

---
 indra/newview/llvieweroctree.cpp                     |  4 +---
 indra/newview/skins/default/xui/en/floater_stats.xml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index 30658c57bf..47033afea3 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -42,7 +42,6 @@ BOOL LLViewerOctreeDebug::sInDebug = FALSE;
 static LLTrace::CountStatHandle<S32> sOcclusionQueries("occlusion_queries", "Number of occlusion queries executed"),
 									 sNumObjectsOccluded("occluded_objects", "Count of objects being occluded by a query"),
 									 sNumObjectsUnoccluded("unoccluded_objects", "Count of objects being unoccluded by a query");
-static LLTrace::SampleStatHandle<S32> sOcclusionQueriesInFlight("occlusion_queries_in_flight", "Number of occlusion queries waiting for results");
 
 //-----------------------------------------------------------------------------------
 //some global functions definitions
@@ -784,6 +783,7 @@ protected:
 	{
 #if LL_TRACK_PENDING_OCCLUSION_QUERIES
 		LLSpatialGroup::sPendingQueries.erase(name);
+
 #endif
 		llassert(std::find(mAvailableName.begin(), mAvailableName.end(), name) == mAvailableName.end());
 		mAvailableName.push_back(name);
@@ -1095,7 +1095,6 @@ void LLOcclusionCullingGroup::checkOcclusion()
 #if LL_TRACK_PENDING_OCCLUSION_QUERIES
 					sPendingQueries.erase(mOcclusionQuery[LLViewerCamera::sCurCameraID]);
 #endif
-					add(sOcclusionQueriesInFlight, -1);
 				}
 				else if (mOcclusionQuery[LLViewerCamera::sCurCameraID])
 				{ //delete the query to avoid holding onto hundreds of pending queries
@@ -1200,7 +1199,6 @@ void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* sh
 					sPendingQueries.insert(mOcclusionQuery[LLViewerCamera::sCurCameraID]);
 #endif
 					add(sOcclusionQueries, 1);
-					add(sOcclusionQueriesInFlight, 1);
 
 					{
 						LL_RECORD_BLOCK_TIME(FTM_PUSH_OCCLUSION_VERTS);
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 02d1bf6a0e..fa1823ed67 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -75,7 +75,16 @@
                     label="Object Cache Hit Rate"
                     stat="object_cache_hits"
                     show_history="true"/>
-        </stat_view>
+					<stat_bar name="occlusion_queries"
+										label="Occlusion Queries Performed"
+										stat="occlusion_queries"/>
+					<stat_bar name="occluded"
+										label="Objects Occluded"
+										stat="occluded_objects"/>
+					<stat_bar name="unoccluded"
+										label="Object Unoccluded"
+										stat="unoccluded_objects"/>
+				</stat_view>
         <stat_view name="texture"
                    label="Texture"
                    follows="left|top|right"
-- 
cgit v1.2.3