summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer_class.cpp
diff options
context:
space:
mode:
authorKyle Ambroff <ambroff@lindenlab.com>2010-11-15 14:14:00 -0800
committerKyle Ambroff <ambroff@lindenlab.com>2010-11-15 14:14:00 -0800
commited9af1151fea725574ddedafd75a9ecfb5927082 (patch)
tree6fb865d740e84865b439d224043a5de7151765c8 /indra/llcommon/llfasttimer_class.cpp
parent0dbf75ab657446b51e6e9795ddccc16bb9f6fd02 (diff)
parenta9eb639511a09dc072e67e10d8885a0b4f7587da (diff)
Merge with lindenlab/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;