diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
| commit | 7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch) | |
| tree | 99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/newview/llviewerstats.cpp | |
| parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) | |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index bb490959c7..baf241697b 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -38,8 +38,8 @@ public: const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] = { - // ST_MOUSELOOK_SECONDS - StatAttributes("Seconds in Mouselook", FALSE, TRUE), + // ST_VERSION + StatAttributes("Version", TRUE, FALSE), // ST_AVATAR_EDIT_SECONDS StatAttributes("Seconds in Edit Appearence", FALSE, TRUE), // ST_TOOLBOX_SECONDS @@ -58,10 +58,10 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] = StatAttributes("Object rez count", FALSE, FALSE), // ST_FPS_10_SECONDS StatAttributes("Seconds below 10 FPS", FALSE, TRUE), - // ST_FPS_5_SECONDS - StatAttributes("Seconds below 5 FPS", FALSE, TRUE), // ST_FPS_2_SECONDS StatAttributes("Seconds below 2 FPS", FALSE, TRUE), + // ST_MOUSELOOK_SECONDS + StatAttributes("Seconds in Mouselook", FALSE, TRUE), // ST_FLY_COUNT StatAttributes("Fly count", FALSE, FALSE), // ST_TELEPORT_COUNT @@ -229,10 +229,6 @@ void LLViewerStats::updateFrameStats(const F64 time_diff) { incStat(LLViewerStats::ST_FPS_2_SECONDS, time_diff); } - if (time_diff >= 0.2) - { - incStat(LLViewerStats::ST_FPS_5_SECONDS, time_diff); - } if (time_diff >= 0.125) { incStat(LLViewerStats::ST_FPS_8_SECONDS, time_diff); |