diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-29 14:08:47 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-29 14:08:47 -0500 |
| commit | 93ee0b044f77ab07bb9df08bf52c9f4afa713caa (patch) | |
| tree | 08490033f3628dadb0073bf2b07d5e7af0ec1798 /indra/llcommon | |
| parent | 28b628ab7b92243a6e40fcdf87f4e2c5b44150e7 (diff) | |
| parent | 8204145ab1c4b8f8a509db15f61bbdd264532508 (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r--[-rwxr-xr-x] | indra/llcommon/llfasttimer_class.h | 0 | ||||
| -rw-r--r-- | indra/llcommon/llqueuedthread.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llcommon/llthread.cpp | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index 827747f0c6..827747f0c6 100755..100644 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h 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 diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index b4617c5453..b4617c5453 100755..100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp |