summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer_class.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-23 10:44:59 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-23 10:44:59 -0700
commit01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (patch)
treee7b7ca976f17c8af3c8a2648a801030594e94c8c /indra/llcommon/llfasttimer_class.cpp
parent7daa3d1ca10199468946feef0ce8eb67489deee0 (diff)
parentff5e3f5c2e566f3a8e86efaa763f7b12e07eeb53 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
-rw-r--r--indra/llcommon/llfasttimer_class.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp
index c45921cdec..bce87ada96 100644
--- a/indra/llcommon/llfasttimer_class.cpp
+++ b/indra/llcommon/llfasttimer_class.cpp
@@ -56,6 +56,7 @@ bool LLFastTimer::sPauseHistory = 0;
bool LLFastTimer::sResetHistory = 0;
LLFastTimer::CurTimerData LLFastTimer::sCurTimerData;
BOOL LLFastTimer::sLog = FALSE;
+std::string LLFastTimer::sLogName = "";
BOOL LLFastTimer::sMetricLog = FALSE;
LLMutex* LLFastTimer::sLogLock = NULL;
std::queue<LLSD> LLFastTimer::sLogQueue;