diff options
| author | Richard Linden <none@none> | 2013-10-17 14:28:08 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-17 14:28:08 -0700 |
| commit | 92c4677a840417546e95b474a4f78ca8d86fc5ba (patch) | |
| tree | 6d46d1868d56a0b59d88accebda4b58cb43c7be8 /indra/llcommon/lltracethreadrecorder.cpp | |
| parent | 2b4dfefda216a0333426ac2a8f06d23ee6ef0aee (diff) | |
| parent | 1beaedacadc8093c9df612992a873f9c89354bce (diff) | |
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg._vi9rd\http__bitbucket.org_lindenlab_viewer-interesting_s1et2g.hg
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); } |