diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-06 12:22:06 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-06 12:22:06 -0800 |
| commit | a91c2d889aad577fb22dc8f11e0dd168d71ec09d (patch) | |
| tree | 6f8234a6fcac9457c685495c2bdca6bf60a8f2df /indra/newview/llviewerstats.cpp | |
| parent | f2524568ea1895df58b7735fe959c772d558160d (diff) | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerstats.cpp | 9 |
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; } |