summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer_class.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-01 10:55:24 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-01 10:55:24 -0500
commitbfd8efb05753ac9ed858476797b5d407c912d926 (patch)
tree52905cf59bcd5b67ddc186b26a23959201353a7a /indra/llcommon/llfasttimer_class.cpp
parented64630a67c2c216c369099532323cab2e251cab (diff)
parentb778ba9b882ecb03e61b3b9bd833618ca096f5da (diff)
Automated merge up 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;