diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-07-02 18:06:22 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-07-02 18:06:22 -0400 |
commit | 8e5197a71bef5704956ed61eab03509a1cdb6f6f (patch) | |
tree | 499fd5e906372f74a25d77331b9d5a0d9a8afef4 /indra/llcommon/llthread.cpp | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
parent | e8b0088d1a0c02bfa1f9768dc91fc3df4322adae (diff) |
Merge 3.3.3 release with Drano HTTP library at 3.3.0
Big delta was converting the new texture debugger support code
to the new library. Viewer manifest should probably get an eyeball
before release.
Diffstat (limited to 'indra/llcommon/llthread.cpp')
-rw-r--r-- | indra/llcommon/llthread.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index a6ad6b125c..b27b64b26f 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -71,6 +71,13 @@ LL_COMMON_API void assert_main_thread() } } +void LLThread::registerThreadID() +{ +#if !LL_DARWIN + sThreadID = ++sIDIter; +#endif +} + // // Handed to the APR thread creation function // |