summaryrefslogtreecommitdiff
path: root/indra/newview/llfasttimerview.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-10-07 17:51:28 -0700
committerbrad kittenbrink <brad@lindenlab.com>2009-10-07 17:51:28 -0700
commit50247533f99f374be71728cc5ca00f0444189a9f (patch)
treec1505ec3ec9c054447fb98968c9299e502857000 /indra/newview/llfasttimerview.cpp
parent146e084af3344ada737340115c5fa063c0aab6b3 (diff)
parentd885db79f94ee3d6a2b4ed7febe7beb69d0c7d51 (diff)
Merged latest viewer/login-api with latest 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 0bd4389b50..2be8ac4a0e 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)
{