diff options
| author | callum <none@none> | 2010-11-15 17:21:27 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-11-15 17:21:27 -0800 |
| commit | b4efcccce7438a72078c02dd404080d6dee37622 (patch) | |
| tree | 6d4890e3ace464bba7c81d3235ab799538080b02 /indra/llcommon/llfasttimer_class.cpp | |
| parent | a52e06d209925d1942230e8c129d8b19af7b88b5 (diff) | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
Merge with tip of of viewer-development (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; |