summaryrefslogtreecommitdiff
path: root/indra/llcommon/llthread.h
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 17:03:11 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 17:03:11 -0800
commite173dea8a0b235a4664bfba213e96bed090069bf (patch)
tree46b476ee361463e2035d7be5ce5eeb0d2d039915 /indra/llcommon/llthread.h
parentdd6b684c70e5b732bebae0303c9dcf383332d295 (diff)
parentbe210914f4e9081f021cc1ad3b671765aba79b61 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llcommon/llthread.h')
-rw-r--r--indra/llcommon/llthread.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 115bf47553..5c8bbca2ca 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -88,6 +88,11 @@ public:
U32 getID() const { return mID; }
+ // Called by threads *not* created via LLThread to register some
+ // internal state used by LLMutex. You must call this once early
+ // in the running thread to prevent collisions with the main thread.
+ static void registerThreadID();
+
private:
BOOL mPaused;