diff options
| author | Richard Linden <none@none> | 2013-10-17 14:23:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-17 14:23:56 -0700 |
| commit | 1beaedacadc8093c9df612992a873f9c89354bce (patch) | |
| tree | a056537b11fb577b7dee9ed236a2616eb0989d9d /indra/llcommon/lltracethreadrecorder.cpp | |
| parent | 1c26d4265666cd232d38724ad6f1e32fd2dc2d34 (diff) | |
moved root timer to global variable
added flag to LLInstanceTracker to allow multiple values per key
made StatType allow multiple values per key to eliminate block timer related crash
Diffstat (limited to 'indra/llcommon/lltracethreadrecorder.cpp')
| -rw-r--r-- | indra/llcommon/lltracethreadrecorder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp index 20e8a0bbaa..7b7da5343d 100644 --- a/indra/llcommon/lltracethreadrecorder.cpp +++ b/indra/llcommon/lltracethreadrecorder.cpp @@ -81,7 +81,7 @@ void ThreadRecorder::init() BlockTimerStatHandle::getRootTimeBlock().getCurrentAccumulator().mActiveCount = 1; claim_alloc(gTraceMemStat, this); - claim_alloc(gTraceMemStat, sizeof(BlockTimer)); + claim_alloc(gTraceMemStat, mRootTimer); claim_alloc(gTraceMemStat, sizeof(TimeBlockTreeNode) * mNumTimeBlockTreeNodes); } |