diff options
| author | Richard Linden <none@none> | 2013-06-27 00:08:58 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-27 00:08:58 -0700 |
| commit | 0f178ec33debc6d92f3b2aa2392e640eb342a095 (patch) | |
| tree | eb13db7dc222dda47b6a78c0e40299ef1e74fafc /indra/llcommon/lltrace.cpp | |
| parent | 88fee7f87fc4a987a05002fedfcae11d6b42ba59 (diff) | |
| parent | 808d3eff198d65e5a870abb670786935fc8356bd (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltrace.cpp')
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index 59a4b42c97..25807c7b2c 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -35,8 +35,6 @@ static S32 sInitializationCount = 0; namespace LLTrace { -static MasterThreadRecorder* gUIThreadRecorder = NULL; - void init() { if (sInitializationCount++ == 0) @@ -59,28 +57,6 @@ void cleanup() } } -MasterThreadRecorder& getUIThreadRecorder() -{ - llassert(gUIThreadRecorder != NULL); - return *gUIThreadRecorder; -} - -LLThreadLocalPointer<ThreadRecorder>& get_thread_recorder_ptr() -{ - static LLThreadLocalPointer<ThreadRecorder> s_thread_recorder; - return s_thread_recorder; -} - -const LLThreadLocalPointer<ThreadRecorder>& get_thread_recorder() -{ - return get_thread_recorder_ptr(); -} - -void set_thread_recorder(ThreadRecorder* recorder) -{ - get_thread_recorder_ptr() = recorder; -} - TimeBlockTreeNode::TimeBlockTreeNode() : mBlock(NULL), |