diff options
| author | Richard Linden <none@none> | 2012-09-26 19:12:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-26 19:12:40 -0700 |
| commit | 07c4be092b276f0d7c14ba12872efb31c1f16764 (patch) | |
| tree | 06c7d37425301130295fe62a2f4db2ea7c2b562c /indra/llcommon/llthread.h | |
| parent | 05a3203d8274a0a0999faad128f629614b8d62c5 (diff) | |
SH-3275 WIP Run viewer metrics for object update messages
slave threads now pushing data to master thread
Diffstat (limited to 'indra/llcommon/llthread.h')
| -rw-r--r-- | indra/llcommon/llthread.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index 6889fab2c1..5cd287ec39 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -87,7 +87,8 @@ public: U32 getID() const { return mID; } - static LLTrace::ThreadTraceData* getTraceData() { return sTraceData.get(); } + static LLTrace::ThreadTrace* getTraceData() { return sTraceData.get(); } + static void setTraceData(LLTrace::ThreadTrace* data) { sTraceData = data;} private: BOOL mPaused; @@ -105,7 +106,7 @@ protected: EThreadStatus mStatus; U32 mID; - static LLThreadLocalPtr<LLTrace::SlaveThreadTrace> sTraceData; + static LLThreadLocalPtr<LLTrace::ThreadTrace> sTraceData; //a local apr_pool for APRFile operations in this thread. If it exists, LLAPRFile::sAPRFilePoolp should not be used. //Note: this pool is used by APRFile ONLY, do NOT use it for any other purposes. |