diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
commit | b9cf73c29b4b87a391c78415e4c09c31b4ac045c (patch) | |
tree | d843f4e78bc6874001cb81fc993cc59d0a179a83 /indra/llcommon/llfasttimer_class.cpp | |
parent | a59c43f1adff35107e59fdfc3016d4329324bbaf (diff) | |
parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) |
merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
-rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 1 |
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; |