diff options
| author | Richard Linden <none@none> | 2012-09-06 23:01:32 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-06 23:01:32 -0700 |
| commit | f015903c86225e9c92f9514b4974c661bfb7c8fd (patch) | |
| tree | c62860dd8e68a639398c79e1d1acff5d37f9340f /indra | |
| parent | 21a7b6ea93e71a6b9e1e8bfa734b69931d7d5bfc (diff) | |
| parent | 8d4ceab6a34d58c5f4235baa870eb88d86df30f3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lltrace.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 2c907c32ee..c6940c12a2 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -28,6 +28,7 @@ #define LL_LLTRACE_H #include "stdtypes.h" +#include "llpreprocessor.h" #include <vector> #include <boost/type_traits/alignment_of.hpp> @@ -176,8 +177,8 @@ namespace LLTrace accumulator->mChildTimeCounter += sCurRecorder.mChildTime; accumulator->mActiveCount--; - accumulator->mLastCaller = mLastRecorder->mAccumulator; - mLastRecorder->mChildTime += total_time; + accumulator->mLastCaller = mLastRecorder.mAccumulator; + mLastRecorder.mChildTime += total_time; // pop stack sCurRecorder = mLastRecorder; @@ -188,7 +189,7 @@ namespace LLTrace }; private: - U32 getCPUClockCount32() + static U32 getCPUClockCount32() { U32 ret_val; __asm @@ -219,7 +220,7 @@ namespace LLTrace return ret_val; } - static RecorderStackEntry* sCurRecorder; + static RecorderStackEntry sCurRecorder; }; BlockTimer::RecorderStackEntry BlockTimer::sCurRecorder; |