local merge

3 files changed, 31 insertions, 32 deletions

diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 16a76723eb..5cfd56193e 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -145,18 +145,21 @@ LLFloaterMediaSettings* LLFloaterMediaSettings::getInstance()
 //static 
 void LLFloaterMediaSettings::apply()
 {
-	LLSD settings;
-	sInstance->mPanelMediaSettingsGeneral->preApply();
-	sInstance->mPanelMediaSettingsGeneral->getValues( settings );
-	sInstance->mPanelMediaSettingsSecurity->preApply();
-	sInstance->mPanelMediaSettingsSecurity->getValues( settings );
-	sInstance->mPanelMediaSettingsPermissions->preApply();
-	sInstance->mPanelMediaSettingsPermissions->getValues( settings );
-	LLSelectMgr::getInstance()->selectionSetMedia( LLTextureEntry::MF_HAS_MEDIA );
-	LLSelectMgr::getInstance()->selectionSetMediaData(settings);
-	sInstance->mPanelMediaSettingsGeneral->postApply();
-	sInstance->mPanelMediaSettingsSecurity->postApply();
-	sInstance->mPanelMediaSettingsPermissions->postApply();
+	if (sInstance->haveValuesChanged())
+	{
+		LLSD settings;
+		sInstance->mPanelMediaSettingsGeneral->preApply();
+		sInstance->mPanelMediaSettingsGeneral->getValues( settings );
+		sInstance->mPanelMediaSettingsSecurity->preApply();
+		sInstance->mPanelMediaSettingsSecurity->getValues( settings );
+		sInstance->mPanelMediaSettingsPermissions->preApply();
+		sInstance->mPanelMediaSettingsPermissions->getValues( settings );
+		LLSelectMgr::getInstance()->selectionSetMedia( LLTextureEntry::MF_HAS_MEDIA );
+		LLSelectMgr::getInstance()->selectionSetMediaData(settings);
+		sInstance->mPanelMediaSettingsGeneral->postApply();
+		sInstance->mPanelMediaSettingsSecurity->postApply();
+		sInstance->mPanelMediaSettingsPermissions->postApply();
+	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -249,15 +252,6 @@ void LLFloaterMediaSettings::onTabChanged(void* user_data, bool from_click)
 	LLTabContainer* self = (LLTabContainer*)user_data;
 	gSavedSettings.setS32("LastMediaSettingsTab", self->getCurrentPanelIndex());
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterMediaSettings::enableOkApplyBtns( bool enable )
-{
-	childSetEnabled( "OK", enable );
-	childSetEnabled( "Apply", enable );
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 const std::string LLFloaterMediaSettings::getHomeUrl()
@@ -272,17 +266,25 @@ const std::string LLFloaterMediaSettings::getHomeUrl()
 // virtual 
 void LLFloaterMediaSettings::draw()
 {
+	// Set the enabled state of the "Apply" button if values changed
+	childSetEnabled( "Apply", haveValuesChanged() );
+	
+	LLFloater::draw();
+}
+
+
+//private
+bool LLFloaterMediaSettings::haveValuesChanged() const
+{
+	bool values_changed = false;
 	// *NOTE: The code below is very inefficient.  Better to do this
 	// only when data change.
 	// Every frame, check to see what the values are.  If they are not
-	// the same as the default media data, enable the OK/Apply buttons
+	// the same as the initial media data, enable the OK/Apply buttons
 	LLSD settings;
 	sInstance->mPanelMediaSettingsGeneral->getValues( settings );
 	sInstance->mPanelMediaSettingsSecurity->getValues( settings );
-	sInstance->mPanelMediaSettingsPermissions->getValues( settings );
-
-	bool values_changed = false;
-	
+	sInstance->mPanelMediaSettingsPermissions->getValues( settings );	
 	LLSD::map_const_iterator iter = settings.beginMap();
 	LLSD::map_const_iterator end = settings.endMap();
 	for ( ; iter != end; ++iter )
@@ -295,9 +297,6 @@ void LLFloaterMediaSettings::draw()
 			break;
 		}
 	}
-	
-	enableOkApplyBtns(values_changed);
-	
-	LLFloater::draw();
+	return values_changed;
 }
 
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h
index b72e3d855d..cdfd5aa8ae 100644
--- a/indra/newview/llfloatermediasettings.h
+++ b/indra/newview/llfloatermediasettings.h
@@ -85,7 +85,7 @@ protected:
 
 private:
 
-	void enableOkApplyBtns( bool enable );
+	bool haveValuesChanged() const;
 	
 	LLSD mInitialValues;
 	bool mWaitingToClose;
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index bffb28d16e..03528c578c 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -9,7 +9,7 @@
 	width="800">
   <string name="control_background_image_name">Inspector_Background</string>
   <string name="skip_step">0.2</string>
-  <string name="min_width">300</string>
+  <string name="min_width">400</string>
   <string name="min_height">120</string>
   <string name="zoom_near_padding">1.0</string>
   <string name="zoom_medium_padding">1.25</string>