summaryrefslogtreecommitdiff
path: root/indra/llcommon
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/llcommon
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/llcommon')
-rw-r--r--indra/llcommon/llqueuedthread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h
index c75e0e2bbf..a53b22f6fc 100644
--- a/indra/llcommon/llqueuedthread.h
+++ b/indra/llcommon/llqueuedthread.h
@@ -179,7 +179,7 @@ public:
void waitOnPending();
void printQueueStats();
- S32 getPending();
+ virtual S32 getPending();
bool getThreaded() { return mThreaded ? true : false; }
// Request accessors