diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-27 23:15:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-27 23:15:22 -0700 |
| commit | 40979589afc5c91cab977307a1e400315b1c8a8f (patch) | |
| tree | f12b89dc3256ad80c5b90c70ed4ebf2a4018a3c0 /indra/llcommon | |
| parent | e29bb9d9f87dc747b7e9cd204a1599a668d986d0 (diff) | |
STORM-105 : improve decompression perf gathering, allow perf name to be passed on the command line, fix crash in analysis phase
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 1 | ||||
| -rw-r--r-- | indra/llcommon/llfasttimer_class.h | 1 |
2 files changed, 2 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; diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index 1158ac5140..eb9789682b 100644 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h @@ -211,6 +211,7 @@ public: static std::queue<LLSD> sLogQueue; static BOOL sLog; static BOOL sMetricLog; + static std::string sLogName; static bool sPauseHistory; static bool sResetHistory; static U64 sTimerCycles; |