aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerstats.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewerstats.cpp')
-rw-r--r--linden/indra/newview/llviewerstats.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index e1e783c..e04918e 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -57,8 +57,8 @@ public:
57 57
58const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] = 58const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
59{ 59{
60 // ST_MOUSELOOK_SECONDS 60 // ST_VERSION
61 StatAttributes("Seconds in Mouselook", FALSE, TRUE), 61 StatAttributes("Version", TRUE, FALSE),
62 // ST_AVATAR_EDIT_SECONDS 62 // ST_AVATAR_EDIT_SECONDS
63 StatAttributes("Seconds in Edit Appearence", FALSE, TRUE), 63 StatAttributes("Seconds in Edit Appearence", FALSE, TRUE),
64 // ST_TOOLBOX_SECONDS 64 // ST_TOOLBOX_SECONDS
@@ -77,10 +77,10 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
77 StatAttributes("Object rez count", FALSE, FALSE), 77 StatAttributes("Object rez count", FALSE, FALSE),
78 // ST_FPS_10_SECONDS 78 // ST_FPS_10_SECONDS
79 StatAttributes("Seconds below 10 FPS", FALSE, TRUE), 79 StatAttributes("Seconds below 10 FPS", FALSE, TRUE),
80 // ST_FPS_5_SECONDS
81 StatAttributes("Seconds below 5 FPS", FALSE, TRUE),
82 // ST_FPS_2_SECONDS 80 // ST_FPS_2_SECONDS
83 StatAttributes("Seconds below 2 FPS", FALSE, TRUE), 81 StatAttributes("Seconds below 2 FPS", FALSE, TRUE),
82 // ST_MOUSELOOK_SECONDS
83 StatAttributes("Seconds in Mouselook", FALSE, TRUE),
84 // ST_FLY_COUNT 84 // ST_FLY_COUNT
85 StatAttributes("Fly count", FALSE, FALSE), 85 StatAttributes("Fly count", FALSE, FALSE),
86 // ST_TELEPORT_COUNT 86 // ST_TELEPORT_COUNT
@@ -248,10 +248,6 @@ void LLViewerStats::updateFrameStats(const F64 time_diff)
248 { 248 {
249 incStat(LLViewerStats::ST_FPS_2_SECONDS, time_diff); 249 incStat(LLViewerStats::ST_FPS_2_SECONDS, time_diff);
250 } 250 }
251 if (time_diff >= 0.2)
252 {
253 incStat(LLViewerStats::ST_FPS_5_SECONDS, time_diff);
254 }
255 if (time_diff >= 0.125) 251 if (time_diff >= 0.125)
256 { 252 {
257 incStat(LLViewerStats::ST_FPS_8_SECONDS, time_diff); 253 incStat(LLViewerStats::ST_FPS_8_SECONDS, time_diff);