ESC-154 ESC-156 Integrating metrics collector into viewer.

After discussions, renamed 'QAModeMetricsSubmetrics' to 'QAModeMetrics'
and confirmed that LLCachedControl<> is the way to go.  Moved the
resulting flag out of LLViewerAssetStats (where it didn't belong)
and it lives in both LLAppViewer and LLTextureFetch where it does
belong.

1 files changed, 2 insertions, 9 deletions

diff --git a/indra/newview/llviewerassetstats.h b/indra/newview/llviewerassetstats.h
index 1668a1bc9d..b0fb17ae17 100644
--- a/indra/newview/llviewerassetstats.h
+++ b/indra/newview/llviewerassetstats.h
@@ -140,7 +140,7 @@ public:
 	};
 
 public:
-	LLViewerAssetStats(bool qa_mode);
+	LLViewerAssetStats();
 	// Default destructor is correct.
 	LLViewerAssetStats & operator=(const LLViewerAssetStats &);			// Not defined
 
@@ -197,10 +197,6 @@ public:
 	// final result is undefined (little defensive action).
 	static void mergeRegionsLLSD(const LLSD & src, LLSD & dst);
 
-	// QA mode is established during initialization so we don't
-	// touch LLSD at runtime.
-	bool isQAMode() const { return mQAMode; }
-	
 protected:
 	typedef std::map<LLUUID, LLPointer<PerRegionStats> > PerRegionContainer;
 
@@ -219,9 +215,6 @@ protected:
 
 	// Time of last reset
 	duration_t mResetTimestamp;
-
-	// QA Mode
-	const bool mQAMode;
 };
 
 
@@ -252,7 +245,7 @@ namespace LLViewerAssetStatsFF
  * you'll likely get away with calling it afterwards.  cleanup() should only be
  * called after threads are shutdown to prevent races on the global pointers.
  */
-void init(bool qa_mode);
+void init();
 
 void cleanup();