summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-22 14:24:28 -0800
committerDon Kjer <don@lindenlab.com>2010-12-22 14:24:28 -0800
commit0f5d8e53cad9afe4f5601c6a6cdd82ec474935e5 (patch)
tree25333fe8d8ba1c19b176d7feade03ccecfdd5829 /indra/llcommon
parent649dd6eb74023d48379ebaadd2ff000801306f17 (diff)
parentc86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff)
Merge with viewer-development
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