summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-07-18 12:37:52 -0700
committerRichard Linden <none@none>2012-07-18 12:37:52 -0700
commitdf7d6c90758eef95f2c8c004611add495b8a5eee (patch)
tree3262782536d5eb3ce7118db02eb6fd3171c87f62 /indra/newview/llviewerwindow.cpp
parent5564fcb271d993b1b8a98fae7f832f47f1236fd4 (diff)
SH-3275 WIP Run viewer metrics for object update messages
continued clean up of llstats stuff
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-xindra/newview/llviewerwindow.cpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 39e330ad66..9e9b41d3c8 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -333,19 +333,13 @@ public:
if (gSavedSettings.getBOOL("DebugShowTime"))
{
const U32 y_inc2 = 15;
- for (std::map<S32,LLFrameTimer>::reverse_iterator iter = gDebugTimers.rbegin();
- iter != gDebugTimers.rend(); ++iter)
- {
- S32 idx = iter->first;
- LLFrameTimer& timer = iter->second;
- F32 time = timer.getElapsedTimeF32();
- S32 hours = (S32)(time / (60*60));
- S32 mins = (S32)((time - hours*(60*60)) / 60);
- S32 secs = (S32)((time - hours*(60*60) - mins*60));
- std::string label = gDebugTimerLabel[idx];
- if (label.empty()) label = llformat("Debug: %d", idx);
- addText(xpos, ypos, llformat(" %s: %d:%02d:%02d", label.c_str(), hours,mins,secs)); ypos += y_inc2;
- }
+ LLFrameTimer& timer = gTextureTimer;
+ F32 time = timer.getElapsedTimeF32();
+ S32 hours = (S32)(time / (60*60));
+ S32 mins = (S32)((time - hours*(60*60)) / 60);
+ S32 secs = (S32)((time - hours*(60*60) - mins*60));
+ addText(xpos, ypos, llformat(" "Texture": %d:%02d:%02d", hours,mins,secs)); ypos += y_inc2;
+
F32 time = gFrameTimeSeconds;
S32 hours = (S32)(time / (60*60));