diff options
author | Richard Linden <none@none> | 2013-10-24 14:42:00 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-10-24 14:42:00 -0700 |
commit | 371198289b2e3f5894071483968d5e0fa7a4ceeb (patch) | |
tree | 39c8962bf5a08a5aad2cdde07752e0a6337b16c4 /indra/llcommon/llthreadlocalstorage.h | |
parent | 066182bf064d74c84313220dba3a10a3c318d634 (diff) | |
parent | d13f26a6fcde03f5464e986b204b2fbb5848d861 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llthreadlocalstorage.h')
-rw-r--r-- | indra/llcommon/llthreadlocalstorage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthreadlocalstorage.h b/indra/llcommon/llthreadlocalstorage.h index 177e822227..ec3b52c8cb 100644 --- a/indra/llcommon/llthreadlocalstorage.h +++ b/indra/llcommon/llthreadlocalstorage.h @@ -43,7 +43,7 @@ public: } LLThreadLocalPointerBase( const LLThreadLocalPointerBase& other) - : mThreadKey(NULL) + : mThreadKey(NULL) { if (sInitialized) { |