summaryrefslogtreecommitdiff
path: root/indra/newview/llfasttimerview.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-30 21:42:04 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-09-30 21:42:04 -0400
commiteca30a22626b9a3e68e0e55f8da75614cd60d713 (patch)
treed27f30f138553c1f0fbc0e61ef0d2ae036d54662 /indra/newview/llfasttimerview.cpp
parentbc4444cd78067cbf11d3ffb210375a31a33f96bd (diff)
parent3f05d552fec9d4d9a17c9131f445a7db0eef561f (diff)
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
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)
{