Second Life viewer sources 1.19.0.0

1 files changed, 4 insertions, 12 deletions

diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index 2d2f951..ea24d9e 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -52,7 +52,7 @@
 #include "lldebugview.h"
 #include "llfasttimerview.h"
 #include "llviewerregion.h"
-#include "llfloaterhtmlhelp.h"
+#include "llfloaterhtml.h"
 #include "llworld.h"
 #include "llfeaturemanager.h"
 #if LL_WINDOWS && LL_LCD_COMPILE
@@ -187,7 +187,7 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
         // ST_CROSSING_MAX
         StatAttributes("CROSSING_MAX", FALSE, FALSE),
         // ST_LIBXUL_WIDGET_USED
-        StatAttributes("LibXUL Widget used", FALSE, FALSE),
+        StatAttributes("LibXUL Widget used", FALSE, FALSE), // Unused
         // ST_WINDOW_WIDTH
         StatAttributes("Window width", FALSE, FALSE),
         // ST_WINDOW_HEIGHT
@@ -575,14 +575,6 @@ void update_statistics(U32 frame_count)
         
         gViewerStats->mTexturePacketsStat.addValue(LLViewerImageList::sTexturePackets);
 
-        // log when the LibXUL (aka Mozilla) widget is used and opened so we can monitor framerate changes
-        #if LL_LIBXUL_ENABLED
-        {
-                BOOL result = gViewerHtmlHelp.getFloaterOpened();
-                gViewerStats->setStat(LLViewerStats::ST_LIBXUL_WIDGET_USED, (F64)result);
-        }
-        #endif
-
         {
                 static F32 visible_avatar_frames = 0.f;
                 static F32 avg_visible_avatars = 0;