merge with viewer-development

1 files changed, 10 insertions, 9 deletions

diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 3a99432b48..90d0c7e04b 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -42,6 +42,7 @@
 #include "httpoptions.h"
 #include "httpheaders.h"
 #include "httphandler.h"
+#include "lltrace.h"
 
 class LLViewerTexture;
 class LLTextureFetchWorker;
@@ -64,8 +65,8 @@ public:
 	class TFRequest;
 	
     // Threads:  Tmain
-	/*virtual*/ S32 update(F32 max_time_ms);
-	
+	/*virtual*/ S32 update(F32 max_time_ms);	
+
 	// called in the main thread after the TextureCacheThread shuts down.
     // Threads:  Tmain
 	void shutDownTextureCacheThread();
@@ -125,8 +126,8 @@ public:
 	void dump();
 
 	// Threads:  T*
-	S32 getNumRequests();
-
+	S32 getNumRequests() ;
+	
 	// Threads:  T*
 	S32 getNumHTTPRequests();
 
@@ -219,7 +220,7 @@ public:
 	void getStateStats(U32 * cache_read, U32 * cache_write, U32 * res_wait);
 
 	// ----------------------------------
-	
+
 protected:
 	// Threads:  T* (but Ttf in practice)
 	void addToNetworkQueue(LLTextureFetchWorker* worker);
@@ -239,7 +240,7 @@ protected:
 	//
 	// Threads:  T*
 	void removeRequest(LLTextureFetchWorker* worker, bool cancel);
-	
+
 	// Overrides from the LLThread tree
 	// Locks:  Ct
 	bool runCondition();
@@ -307,12 +308,12 @@ private:
 	LLMutex mQueueMutex;        //to protect mRequestMap and mCommands only
 	LLMutex mNetworkQueueMutex; //to protect mNetworkQueue, mHTTPTextureQueue and mCancelQueue.
 
-	static LLStat sCacheHitRate;
-	static LLStat sCacheReadLatency;
+	static LLTrace::Measurement<> sCacheHitRate;
+	static LLTrace::Measurement<> sCacheReadLatency;
 
 	LLTextureCache* mTextureCache;
 	LLImageDecodeThread* mImageDecodeThread;
-	
+
 	// Map of all requests by UUID
 	typedef std::map<LLUUID,LLTextureFetchWorker*> map_t;
 	map_t mRequestMap;													// Mfq