1 files changed, 25 insertions, 21 deletions

diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index fd56c21..32d7f63 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -57,15 +57,15 @@
 #include "llviewerwindow.h"             // *TODO: remove, only used for width/height
 #include "llworld.h"
 #include "llfeaturemanager.h"
-#if LL_WINDOWS && LL_LCD_COMPILE
-        #include "lllcd.h"
+#if LL_LCD_COMPILE
+#include "lllcd.h"
 #endif
 
 
 class StatAttributes
 {
 public:
-        StatAttributes(const char *name,
+        StatAttributes(const char* name,
                                    const BOOL enabled,
                                    const BOOL is_timer)
                 : mName(name),
@@ -74,9 +74,9 @@ public:
         {
         }
         
-        const char *mName;
-        const BOOL mEnabled;
-        const BOOL mIsTimer;
+        std::string mName;
+        BOOL mEnabled;
+        BOOL mIsTimer;
 };
 
 const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
@@ -332,17 +332,17 @@ void LLViewerStats::addToMessage(LLSD &body) const
 }
 
 // static
-const char *LLViewerStats::statTypeToText(EStatType type)
-{
-        if (type >= 0 && type < ST_COUNT)
-        {
-                return STAT_INFO[type].mName;
-        }
-        else
-        {
-                return "Unknown statistic";
-        }
-}
+// const std::string LLViewerStats::statTypeToText(EStatType type)
+// {
+//      if (type >= 0 && type < ST_COUNT)
+//      {
+//              return STAT_INFO[type].mName;
+//      }
+//      else
+//      {
+//              return "Unknown statistic";
+//      }
+// }
 
 // *NOTE:Mani The following methods used to exist in viewer.cpp
 // Moving them here, but not merging them into LLViewerStats yet.
@@ -598,7 +598,7 @@ void update_statistics(U32 frame_count)
         LLViewerImageList::sTextureBits = 0;
         LLViewerImageList::sTexturePackets = 0;
 
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
         bool LCDenabled = gLcdScreen->Enabled();
         LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled);
 #else
@@ -680,7 +680,7 @@ void send_stats()
         // send fps only for time app spends in foreground
         agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
         agent["version"] = gCurrentVersion;
-        LLString language(gSavedSettings.getString("Language"));
+        std::string language(gSavedSettings.getString("Language"));
         if(language == "default") language = gSavedSettings.getString("SystemLanguage");        
         agent["language"] = language;
         
@@ -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);