diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
commit | 18b7ab0018695e261dbc5058d76f9d371958b034 (patch) | |
tree | 9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/newview/llviewerstats.cpp | |
parent | 60c4621500e478d66a8bdc3a1c80573be2860fee (diff) | |
parent | be139dfb957e1b0d3c59110284c43630d3b57d23 (diff) |
Weekly automated merge from viewer 2.0
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
-rw-r--r-- | indra/newview/llviewerstats.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 3f9a10a4a6..80dbb4b375 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -829,7 +829,11 @@ void send_stats() S32 window_height = gViewerWindow->getWindowHeightRaw(); S32 window_size = (window_width * window_height) / 1024; misc["string_1"] = llformat("%d", window_size); - // misc["string_2"] = + if (gDebugTimers.find(0) != gDebugTimers.end() && gFrameTimeSeconds > 0) + { + misc["string_2"] = llformat("Texture Time: %.2f, Total Time: %.2f", gDebugTimers[0].getElapsedTimeF32(), gFrameTimeSeconds); + } + // misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21 // misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21 |