diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-03-24 16:51:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-03-24 16:51:07 -0700 |
| commit | da407e32fdb68e5aecff99c970d654293e21d0d9 (patch) | |
| tree | 95ed03c2d77c1ef2920cd940345f70ab32bcf97d /indra/newview/llviewerstats.cpp | |
| parent | 7480e069349e2b3a7581267d13f52c63e459af64 (diff) | |
| parent | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff) | |
Merge
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 8059f866ba..41d9f6d067 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -827,7 +827,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 |