diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-18 10:19:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-18 10:19:18 -0400 |
| commit | c86f61fd313a9f64dd0f1c5d100f39d6a3cb8eb0 (patch) | |
| tree | bd2064d723a9596b45ce2df3c33f0556cf01a681 /indra/newview/llviewerstats.cpp | |
| parent | 896b88063ed0e08362c9e277e7ef8aba5afef0db (diff) | |
| parent | a3a4235a8904cf4d6e565c82d5d90d8a64c15180 (diff) | |
automated merge viewer2.0->viewer2.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 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 |