summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-21 10:39:35 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-21 10:39:35 -0500
commit4e98895719d963a72346a7bf59323cdb602f98dd (patch)
treeacb409c1661b3928c58d6d70f60e52e7f5119b64 /indra/llcommon
parente0d77c277a46fa1161505a177e99b456854a98fd (diff)
parent9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff)
Automated merge up from 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