ESC-154 ESC-156 Now using region hash rather than region uuid as identifier.

In the viewer, the region's UUID is acquired very late and isn't generally
used as the canonical region identifier.  The U64 region hash is a better
and more consistently used identifier so I'm moving over to using that as
the region key.  Don't have a proper reserved invalid region hash which is
unfortunate, but then, so much is.

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index f5e2e35e1e..3793085e55 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -506,9 +506,9 @@ public:
 class TFReqSetRegion : public TFRequest
 {
 public:
-	TFReqSetRegion(const LLUUID & region_id)
+	TFReqSetRegion(U64 region_handle)
 		: TFRequest(),
-		  mRegionID(region_id)
+		  mRegionHandle(region_handle)
 		{}
 	TFReqSetRegion & operator=(const TFReqSetRegion &);	// Not defined
 
@@ -518,7 +518,7 @@ public:
 	virtual bool doWork(LLTextureFetch * fetcher);
 		
 public:
-	const LLUUID mRegionID;
+	const U64 mRegionHandle;
 };
 
 
@@ -2654,9 +2654,9 @@ void LLTextureFetch::dump()
 
 // cross-thread command methods
 
-void LLTextureFetch::commandSetRegion(const LLUUID & region_id)
+void LLTextureFetch::commandSetRegion(U64 region_handle)
 {
-	TFReqSetRegion * req = new TFReqSetRegion(region_id);
+	TFReqSetRegion * req = new TFReqSetRegion(region_handle);
 
 	cmdEnqueue(req);
 }
@@ -2735,7 +2735,7 @@ namespace
 bool
 TFReqSetRegion::doWork(LLTextureFetch *)
 {
-	LLViewerAssetStatsFF::set_region_thread1(mRegionID);
+	LLViewerAssetStatsFF::set_region_thread1(mRegionHandle);
 
 	return true;
 }
@@ -2806,9 +2806,9 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher)
 	// still being careful, regardless.
 	LLSD & main_stats = *mReportMain;
 
-	LLSD thread1_stats = gViewerAssetStatsThread1->asLLSD();			// 'duration' & 'regions' from here
-	thread1_stats["message"] = "ViewerAssetMetrics";
-	thread1_stats["sequence"] = report_sequence;
+	LLSD thread1_stats = gViewerAssetStatsThread1->asLLSD();			// 'duration' & 'regions' from this LLSD
+	thread1_stats["message"] = "ViewerAssetMetrics";					// Identifies the type of metrics
+	thread1_stats["sequence"] = report_sequence;						// Sequence number
 	thread1_stats["initial"] = ! reporting_started;						// Initial data from viewer
 	thread1_stats["break"] = LLTextureFetch::svMetricsDataBreak;		// Break in data prior to this report