aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltexturefetch.h')
-rw-r--r--linden/indra/newview/lltexturefetch.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index c48f609..5eca0ba 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -76,8 +76,8 @@ public:
76 S32 getFetchState(const LLUUID& id, F32& decode_progress_p, F32& requested_priority_p, 76 S32 getFetchState(const LLUUID& id, F32& decode_progress_p, F32& requested_priority_p,
77 U32& fetch_priority_p, F32& fetch_dtime_p, F32& request_dtime_p); 77 U32& fetch_priority_p, F32& fetch_dtime_p, F32& request_dtime_p);
78 void dump(); 78 void dump();
79 S32 getNumRequests() { return mRequestMap.size(); } 79 S32 getNumRequests() const { LLMutexLock lock(&mQueueMutex); return mRequestMap.size(); }
80 S32 getNumHTTPRequests() { return mHTTPTextureQueue.size(); } 80 S32 getNumHTTPRequests() const { LLMutexLock lock(&mNetworkQueueMutex); return mHTTPTextureQueue.size(); }
81 81
82 // Public for access by callbacks 82 // Public for access by callbacks
83 void lockQueue() { mQueueMutex.lock(); } 83 void lockQueue() { mQueueMutex.lock(); }
@@ -91,7 +91,6 @@ protected:
91 void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel); 91 void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel);
92 void addToHTTPQueue(const LLUUID& id); 92 void addToHTTPQueue(const LLUUID& id);
93 void removeFromHTTPQueue(const LLUUID& id); 93 void removeFromHTTPQueue(const LLUUID& id);
94 S32 getHTTPQueueSize() { return (S32)mHTTPTextureQueue.size(); }
95 void removeRequest(LLTextureFetchWorker* worker, bool cancel); 94 void removeRequest(LLTextureFetchWorker* worker, bool cancel);
96 // Called from worker thread (during doWork) 95 // Called from worker thread (during doWork)
97 void processCurlRequests(); 96 void processCurlRequests();
@@ -110,8 +109,8 @@ public:
110 S32 mBadPacketCount; 109 S32 mBadPacketCount;
111 110
112private: 111private:
113 LLMutex mQueueMutex; 112 mutable LLMutex mQueueMutex;
114 LLMutex mNetworkQueueMutex; 113 mutable LLMutex mNetworkQueueMutex;
115 114
116 LLTextureCache* mTextureCache; 115 LLTextureCache* mTextureCache;
117 LLImageDecodeThread* mImageDecodeThread; 116 LLImageDecodeThread* mImageDecodeThread;