summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer_class.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-11-11 15:54:06 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-11-11 15:54:06 -0800
commit5f099265fc36c885122457edd87a1ec8c1a80873 (patch)
treeea09410c65f2136932b5bf0d58ccbd20d6abfb4c /indra/llcommon/llfasttimer_class.cpp
parent76d708bdb5230aaeb9a15bb2fb475458d8bb996e (diff)
parent20921d6a1a2e98fee750cb5a76adddb7266183f3 (diff)
Merge
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;