diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-17 15:32:12 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-17 15:32:12 -0700 |
| commit | 9690d5385d9671b55c2dfc69308b3174397b22ae (patch) | |
| tree | 60a218f5319c8b853320cb5d97ede8cf2f0e04c7 | |
| parent | 72fc80306b9146a545743027aa42f5e68e1c5063 (diff) | |
| parent | 86229c1b57fbb748d622caf875e879c227fce762 (diff) | |
Merge
| -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 |