diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
| commit | c4c8debfc230b4ec6d28c7a84cd2a9bb81d6c894 (patch) | |
| tree | d01f663d3fc1562d773a229e943addb02d14089f /indra/newview/llviewerstats.h | |
| parent | 51865f4e94885471dba0402b33f0b11b72bbdb30 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerstats.h')
| -rwxr-xr-x | indra/newview/llviewerstats.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h index 0d959ed034..7843652589 100755 --- a/indra/newview/llviewerstats.h +++ b/indra/newview/llviewerstats.h @@ -342,7 +342,7 @@ public: // Phase tracking (originally put in for avatar rezzing), tracking // progress of active/completed phases for activities like outfit changing. - typedef std::map<std::string,LLFrameTimer> phase_map_t; + typedef std::map<std::string,LLTimer> phase_map_t; typedef std::map<std::string,StatsAccumulator> phase_stats_t; class PhaseMap { @@ -351,11 +351,10 @@ public: static phase_stats_t sStats; public: PhaseMap(); - LLFrameTimer& getPhaseTimer(const std::string& phase_name); + LLTimer& getPhaseTimer(const std::string& phase_name); bool getPhaseValues(const std::string& phase_name, F32& elapsed, bool& completed); void startPhase(const std::string& phase_name); void stopPhase(const std::string& phase_name); - void stopAllPhases(); void clearPhases(); LLSD asLLSD(); static StatsAccumulator& getPhaseStats(const std::string& phase_name); |