summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-02 18:42:47 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-02 18:42:47 -0500
commit922b1f26b7279b5f54562c413c333463fe34473b (patch)
tree7244f11629a66ad905ca0f56077d31e50632ac28 /indra/newview/lltexturefetch.h
parent0f2ed092c5712cd5dcd928e079671df383227068 (diff)
ESC-211 Metrics data sink - fix delivery by viewer
The TextureFetch thread was still stalling out due to a different path that determines whether there is work or not in the thread (uses getPending()) and that had to be harmonized with the changes to runCondition(). I'm not happy with this solution but a refactor of the LLThread tree isn't in the cards right now.
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r--indra/newview/lltexturefetch.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 03e2462058..af30d1bb3b 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -78,6 +78,7 @@ public:
S32 getNumHTTPRequests() ;
// Public for access by callbacks
+ S32 getPending();
void lockQueue() { mQueueMutex.lock(); }
void unlockQueue() { mQueueMutex.unlock(); }
LLTextureFetchWorker* getWorker(const LLUUID& id);