Decided to refactor a bit. Was using LLSD as an internal data

representation transferring ownership, doing data aggregation
in a very pedantic way.  That's just adding unneeded cost and
complication.  Used the same objects to transport data as are
collecting it and everything got simpler, faster, easier to
read with fewer gotchas.  Bit myself *again* doing the min/max/mean
merges but the unittests where there to pick me up again.  Added
a per-region FPS metric while I was at it.  This is much asked
for and there was a convenient place to sample the value.

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index af30d1bb3b..a8fd3ce244 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -40,6 +40,8 @@ class HTTPGetResponder;
 class LLTextureCache;
 class LLImageDecodeThread;
 class LLHost;
+class LLViewerAssetStats;
+
 namespace { class TFRequest; }
 
 // Interface class
@@ -88,7 +90,10 @@ public:
 
 	// Commands available to other threads to control metrics gathering operations.
 	void commandSetRegion(U64 region_handle);
-	void commandSendMetrics(const std::string & caps_url, LLSD * report_main);
+	void commandSendMetrics(const std::string & caps_url,
+							const LLUUID & session_id,
+							const LLUUID & agent_id,
+							LLViewerAssetStats * main_stats);
 	void commandDataBreak();
 
 	LLCurlRequest & getCurlRequest()	{ return *mCurlGetRequest; }