summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer_class.cpp
diff options
context:
space:
mode:
authorWolfpup Lowenhar <wolfpup67@earthlink.net>2010-11-11 22:37:51 -0500
committerWolfpup Lowenhar <wolfpup67@earthlink.net>2010-11-11 22:37:51 -0500
commit899f470deca2cbc775e87147852e0b118464896f (patch)
treebfee59a4141c4c60ffde94ff8ed6ed9a14d125a6 /indra/llcommon/llfasttimer_class.cpp
parenteea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (diff)
parent5f099265fc36c885122457edd87a1ec8c1a80873 (diff)
STORM-102: 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;