From 8bca439a5af48e7a3e78edf9dc3123821981d644 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 28 Jun 2013 14:39:13 -0500
Subject: [PATCH 1/2] Fixed layout_panel being incorrectly resizeable in
 browser floater, and made layout_panel width more consistent in
 panel_progress.xml

---
 .../newview/skins/default/xui/en-us/floater_web_content.xml | 1 +
 indra/newview/skins/default/xui/en-us/panel_progress.xml    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_web_content.xml b/indra/newview/skins/default/xui/en-us/floater_web_content.xml
index 05f088ae7..1933cfb58 100644
--- a/indra/newview/skins/default/xui/en-us/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_web_content.xml
@@ -142,6 +142,7 @@
     <layout_panel name="status_bar" 
                   height="23"
 		  mouse_opaque="false"
+                  user_resize="false"
                   auto_resize="false">
       <text
         type="string"
diff --git a/indra/newview/skins/default/xui/en-us/panel_progress.xml b/indra/newview/skins/default/xui/en-us/panel_progress.xml
index fdda05605..788ef4c2a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_progress.xml
@@ -3,16 +3,16 @@
   <layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom">
     <layout_panel name="panel1" user_resize="false" min_width="10" width="150"/>
     <layout_panel name="panel2" user_resize="false" min_width="640" width="724" height="768">
-      <layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="640" follows="left|right|top|bottom">
+      <layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="724" follows="left|right|top|bottom">
         <layout_panel name="panel3" min_height="10" height="200" width="724"/>
         <layout_panel name="panel4" min_height="250" height="250" width="724" auto_resize="false">
           <icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/>
           <text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
           <text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
           <progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
-          <text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="700" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
+          <text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" right="-20" bottom="5" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
         </layout_panel>
-        <layout_panel name="panel5" min_width="10" height="200" width="640"/>
+        <layout_panel name="panel5" min_width="10" height="200" width="724"/>
       </layout_stack>
     </layout_panel>
     <layout_panel name="panel6" user_resize="false" min_width="10" width="150"/>

From 8ccf3a20b3ecd357f28e70a0c704ec7eee79a1bd Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 28 Jun 2013 16:11:54 -0500
Subject: [PATCH 2/2] Fix crash that would happen upon revealing then closing
 the wl pref panel and then overriding region windlight settings.

---
 indra/newview/wlfPanel_AdvSettings.cpp | 7 ++++---
 indra/newview/wlfPanel_AdvSettings.h   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index 6cdd0119c..18613c496 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -72,6 +72,7 @@ void wlfPanel_AdvSettings::updateClass()
 
 void wlfPanel_AdvSettings::build()
 {
+	mConnections.clear();
 	deleteAllChildren();
 	std::string ButtonState;
 	if (gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
@@ -161,9 +162,9 @@ BOOL wlfPanel_AdvSettings::postBuild()
 		// mDayCyclePresetCombo = getChild<LLComboBox>("DCPresetsCombo");
 		// mDayCyclePresetCombo->setCommitCallback(boost::bind(&wlfPanel_AdvSettings::onChangeDCPresetName, this, _2));
 
-		LLEnvManagerNew::instance().setPreferencesChangeCallback(boost::bind(&wlfPanel_AdvSettings::refreshLists, this));
-		LLWaterParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateWaterPresetsList, this));
-		LLWLParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateSkyPresetsList, this));
+		mConnections.push_front(new boost::signals2::scoped_connection(LLEnvManagerNew::instance().setPreferencesChangeCallback(boost::bind(&wlfPanel_AdvSettings::refreshLists, this))));
+		mConnections.push_front(new boost::signals2::scoped_connection(LLWaterParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateWaterPresetsList, this))));
+		mConnections.push_front(new boost::signals2::scoped_connection(LLWLParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateSkyPresetsList, this))));
 		// LLDayCycleManager::instance().setModifyCallback(boost::bind(&wlfPanel_AdvSettings::populateDayCyclePresetsList, this));
 
 		populateWaterPresetsList();
diff --git a/indra/newview/wlfPanel_AdvSettings.h b/indra/newview/wlfPanel_AdvSettings.h
index 0a810dc3f..ea7c65d01 100644
--- a/indra/newview/wlfPanel_AdvSettings.h
+++ b/indra/newview/wlfPanel_AdvSettings.h
@@ -33,7 +33,7 @@
 #define LL_wlfPanel_AdvSettings_H
 
 #include "llpanel.h"
-
+#include <boost/ptr_container/ptr_list.hpp>
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -83,6 +83,8 @@ protected:
 	LLSliderCtrl*		mTimeSlider;
 
 	bool mExpanded;
+
+	boost::ptr_list<boost::signals2::scoped_connection> mConnections;
 };
 
 #endif // LL_wlfPanel_AdvSettings_H