summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerstats.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-11-17 15:48:07 -0800
committerMerov Linden <merov@lindenlab.com>2012-11-17 15:48:07 -0800
commit61f3c1b41ddedc16f2026c62600475105621b305 (patch)
treeaf2124f540a4ff55c08cec7038458e883747fe47 /indra/newview/llviewerstats.cpp
parent2d25eb18adc0c2c97c63a8e02f2274362672137c (diff)
parentc6a0f0ae1dec5ef2f7657d8c1ca07d85c1fef55d (diff)
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewerstats.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 8fef13a6bc..d1c6b7ea79 100644..100755
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -949,15 +949,8 @@ LLSD LLViewerStats::PhaseMap::dumpPhases()
for (phase_map_t::iterator iter = mPhaseMap.begin(); iter != mPhaseMap.end(); ++iter)
{
const std::string& phase_name = iter->first;
- result[phase_name]["completed"] = !(iter->second.getStarted());
+ result[phase_name]["completed"] = LLSD::Integer(!(iter->second.getStarted()));
result[phase_name]["elapsed"] = iter->second.getElapsedTimeF32();
-#if 0 // global stats for each phase seem like overkill here
- phase_stats_t::iterator stats_iter = sPhaseStats.find(phase_name);
- if (stats_iter != sPhaseStats.end())
- {
- result[phase_name]["stats"] = stats_iter->second.getData();
- }
-#endif
}
return result;
}