diff options
| author | Richard Linden <none@none> | 2011-12-02 11:03:17 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-12-02 11:03:17 -0800 |
| commit | 968644e2f4f0b942e037011c21fd6d87d8ca637a (patch) | |
| tree | ba9269c538d4933f3e960262a7969189f8f7e4de /indra/newview/llfasttimerview.cpp | |
| parent | d58b5342dc7e8f49ab956523a3dc743b89803b3a (diff) | |
| parent | 4d5a571da457cf454854d4ebc1ddbd5048fcc53f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 065dc5f4be..233038daba 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -105,6 +105,7 @@ void LLFastTimerView::onPause() if (!LLFastTimer::sPauseHistory) { mScrollIndex = 0; + LLFastTimer::sResetHistory = true; getChild<LLButton>("pause_btn")->setLabel(getString("pause")); } else @@ -591,6 +592,7 @@ void LLFastTimerView::draw() { mAvgCountTotal = ticks; mMaxCountTotal = ticks; + LLFastTimer::sResetHistory = false; } } |