diff options
| author | Richard Linden <none@none> | 2013-05-31 16:59:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-31 16:59:00 -0700 |
| commit | 72641a933500f1b1156bd3006c6a227e7fa3567c (patch) | |
| tree | 5921e697f526fbba46daa4e971c167087c37fea6 /indra/llcommon/lltracethreadrecorder.cpp | |
| parent | f6c5a4057d1154e590ee630cb8254879a1f426e4 (diff) | |
| parent | 9def3590f41dee3cba7760e4443fdc71f5fb2db6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
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 75c7cb2ff1..c281b768ce 100644 --- a/indra/llcommon/lltracethreadrecorder.cpp +++ b/indra/llcommon/lltracethreadrecorder.cpp @@ -247,7 +247,7 @@ void SlaveThreadRecorder::SharedData::reset() // MasterThreadRecorder /////////////////////////////////////////////////////////////////////// -LLFastTimer::DeclareTimer FTM_PULL_TRACE_DATA_FROM_SLAVES("Pull slave trace data"); +static LLFastTimer::DeclareTimer FTM_PULL_TRACE_DATA_FROM_SLAVES("Pull slave trace data"); void MasterThreadRecorder::pullFromSlaveThreads() { LLFastTimer _(FTM_PULL_TRACE_DATA_FROM_SLAVES); |