diff options
Diffstat (limited to 'linden/indra/newview/llviewerstats.cpp')
-rw-r--r-- | linden/indra/newview/llviewerstats.cpp | 16 |
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 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -52,7 +52,7 @@ | |||
52 | #include "lldebugview.h" | 52 | #include "lldebugview.h" |
53 | #include "llfasttimerview.h" | 53 | #include "llfasttimerview.h" |
54 | #include "llviewerregion.h" | 54 | #include "llviewerregion.h" |
55 | #include "llfloaterhtmlhelp.h" | 55 | #include "llfloaterhtml.h" |
56 | #include "llworld.h" | 56 | #include "llworld.h" |
57 | #include "llfeaturemanager.h" | 57 | #include "llfeaturemanager.h" |
58 | #if LL_WINDOWS && LL_LCD_COMPILE | 58 | #if LL_WINDOWS && LL_LCD_COMPILE |
@@ -187,7 +187,7 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] = | |||
187 | // ST_CROSSING_MAX | 187 | // ST_CROSSING_MAX |
188 | StatAttributes("CROSSING_MAX", FALSE, FALSE), | 188 | StatAttributes("CROSSING_MAX", FALSE, FALSE), |
189 | // ST_LIBXUL_WIDGET_USED | 189 | // ST_LIBXUL_WIDGET_USED |
190 | StatAttributes("LibXUL Widget used", FALSE, FALSE), | 190 | StatAttributes("LibXUL Widget used", FALSE, FALSE), // Unused |
191 | // ST_WINDOW_WIDTH | 191 | // ST_WINDOW_WIDTH |
192 | StatAttributes("Window width", FALSE, FALSE), | 192 | StatAttributes("Window width", FALSE, FALSE), |
193 | // ST_WINDOW_HEIGHT | 193 | // ST_WINDOW_HEIGHT |
@@ -575,14 +575,6 @@ void update_statistics(U32 frame_count) | |||
575 | 575 | ||
576 | gViewerStats->mTexturePacketsStat.addValue(LLViewerImageList::sTexturePackets); | 576 | gViewerStats->mTexturePacketsStat.addValue(LLViewerImageList::sTexturePackets); |
577 | 577 | ||
578 | // log when the LibXUL (aka Mozilla) widget is used and opened so we can monitor framerate changes | ||
579 | #if LL_LIBXUL_ENABLED | ||
580 | { | ||
581 | BOOL result = gViewerHtmlHelp.getFloaterOpened(); | ||
582 | gViewerStats->setStat(LLViewerStats::ST_LIBXUL_WIDGET_USED, (F64)result); | ||
583 | } | ||
584 | #endif | ||
585 | |||
586 | { | 578 | { |
587 | static F32 visible_avatar_frames = 0.f; | 579 | static F32 visible_avatar_frames = 0.f; |
588 | static F32 avg_visible_avatars = 0; | 580 | static F32 avg_visible_avatars = 0; |