summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-03 18:34:20 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-03 18:34:20 -0500
commita59c43f1adff35107e59fdfc3016d4329324bbaf (patch)
tree7b0a0377d37127f3e086f3a7784f7f6d2b0f3eda
parentca76c55847cdaabe662c880c4d744916c8ca71ac (diff)
ESC-210 Non-active regions were getting extra duration time.
Metrics were crediting inactive regions (those not current but contributing to the sample) with additional time at the end of the sample interval. Corrected.
-rw-r--r--indra/newview/llviewerassetstats.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp
index cc41a95893..d798786277 100644
--- a/indra/newview/llviewerassetstats.cpp
+++ b/indra/newview/llviewerassetstats.cpp
@@ -240,8 +240,9 @@ LLViewerAssetStats::asLLSD()
static const LLSD::String rmean_tag("resp_mean");
const duration_t now = LLViewerAssetStatsFF::get_timestamp();
- LLSD regions = LLSD::emptyMap();
+ mCurRegionStats->accumulateTime(now);
+ LLSD regions = LLSD::emptyMap();
for (PerRegionContainer::iterator it = mRegionStats.begin();
mRegionStats.end() != it;
++it)
@@ -253,7 +254,6 @@ LLViewerAssetStats::asLLSD()
}
PerRegionStats & stats = *it->second;
- stats.accumulateTime(now);
LLSD reg_stat = LLSD::emptyMap();