diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
| commit | 586025bde53ffcd160a9d169cca328ed5078f5f4 (patch) | |
| tree | 1f59d27d08567fd5f3fe02ce42fe6bae37bd3b2c /indra/newview/llfasttimerview.cpp | |
| parent | 3ee3c3ced32bd1e67a6bea51341734c8764df018 (diff) | |
| parent | 609ed855e1160505238378a1be49e2b92e8496f5 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 4dfb93f1bc..e7a3f9b390 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -345,7 +345,7 @@ BOOL LLFastTimerView::handleScrollWheel(S32 x, S32 y, S32 clicks) return TRUE; } -static LLFastTimer::DeclareTimer FTM_RENDER_TIMER("Timers", true); +static LLFastTimer::DeclareTimer FTM_RENDER_TIMER("Timers"); static std::map<LLFastTimer::NamedTimer*, LLColor4> sTimerColors; |