diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
| commit | d5f48181b50d9e941abafd76692359869e71a36d (patch) | |
| tree | 66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/newview/llfasttimerview.cpp | |
| parent | 34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff) | |
| parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) | |
merge up to latest viewer-development
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; } } |