summaryrefslogtreecommitdiff
path: root/indra/newview/llfasttimerview.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-09-18 15:22:25 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-09-18 15:22:25 -0400
commitbb1d4592bdc83f23a60c864ef291c58912d93935 (patch)
treedfb29728340b1fef59227775ecc47aaab117fdd2 /indra/newview/llfasttimerview.cpp
parent91645140d495da4faf1e4905bb8b96c6af579277 (diff)
parent8e7ba92eb9e0371385e3de9a76cc11355be8a974 (diff)
Merged latest viewer/viewer-20 into login-api.
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
-rw-r--r--indra/newview/llfasttimerview.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 8af3a8b539..8b06947c4e 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -996,8 +996,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)
{