diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-09-01 12:21:51 -0400 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-09-01 12:21:51 -0400 |
commit | bae94e434090f83d12941ca25aca13203db671b6 (patch) | |
tree | b83d09a5eb4780c5f3077ac73b10199582f6adcd /indra/newview/llfasttimerview.cpp | |
parent | 3069355a6f33b7bbcfc8c493910a40e6836249e1 (diff) | |
parent | 3dc23bc1831e84b8d8288d9a4f006f9597d9443a (diff) |
Merged login-api with viewer-2.0.0-3 up through r132290.
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
-rw-r--r-- | indra/newview/llfasttimerview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 8ceb41c27a..b406300a38 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -989,8 +989,12 @@ LLSD LLFastTimerView::analyzePerformanceLogDefault(std::istream& is) std::string label = iter->first; F64 time = iter->second["Time"].asReal(); - - total_time += time; + + // Skip the total figure + if(label.compare("Total") != 0) + { + total_time += time; + } if (time > 0.0) { |