summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerstats.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-07-30 14:57:33 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-07-30 14:57:33 -0400
commita5c9d89b28d74c1996a0c950a0c8b1484b43d243 (patch)
treeafd2dc64d86c69390fe2f482870fae0b097b768a /indra/newview/llviewerstats.cpp
parent0f3c5e6458acdf1676f0b7a6dc42ed8cfa286cb0 (diff)
parentd306cb059b9b56c1eb051074e19796b47e1c262d (diff)
merge
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 28f4ec72f3..0be016e5bb 100644..100755
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -945,15 +945,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;
}