diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/llviewerstats.cpp | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 8588d99b21..46fc91aa5a 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -755,10 +755,14 @@ void send_stats() S32 window_width = gViewerWindow->getWindowDisplayWidth(); S32 window_height = gViewerWindow->getWindowDisplayHeight(); + S32 window_size = (window_width * window_height) / 1024; + misc["string_1"] = llformat("%d", window_size); misc["string_1"] = llformat("%.dx%d", window_width, window_height); // misc["string_2"] = - misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6 - misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6 +// misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6 +// misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6 + misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21 + misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21 LLViewerStats::getInstance()->addToMessage(body); |