merge

1 files changed, 9 insertions, 6 deletions

diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 976af121ae..62ec17f89a 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -149,13 +149,14 @@ void LLFloaterMediaSettings::apply()
 	{
 		LLSD settings;
 		sInstance->mPanelMediaSettingsGeneral->preApply();
-		sInstance->mPanelMediaSettingsGeneral->getValues( settings );
+		sInstance->mPanelMediaSettingsGeneral->getValues( settings, false );
 		sInstance->mPanelMediaSettingsSecurity->preApply();
-		sInstance->mPanelMediaSettingsSecurity->getValues( settings );
+		sInstance->mPanelMediaSettingsSecurity->getValues( settings, false );
 		sInstance->mPanelMediaSettingsPermissions->preApply();
-		sInstance->mPanelMediaSettingsPermissions->getValues( settings );
-		LLSelectMgr::getInstance()->selectionSetMedia( LLTextureEntry::MF_HAS_MEDIA );
-		LLSelectMgr::getInstance()->selectionSetMediaData(settings);
+		sInstance->mPanelMediaSettingsPermissions->getValues( settings, false );
+			
+		LLSelectMgr::getInstance()->selectionSetMedia( LLTextureEntry::MF_HAS_MEDIA, settings );
+
 		sInstance->mPanelMediaSettingsGeneral->postApply();
 		sInstance->mPanelMediaSettingsSecurity->postApply();
 		sInstance->mPanelMediaSettingsPermissions->postApply();
@@ -176,6 +177,8 @@ void LLFloaterMediaSettings::onClose(bool app_quitting)
 //static 
 void LLFloaterMediaSettings::initValues( const LLSD& media_settings, bool editable )
 {
+	if (sInstance->hasFocus()) return;
+	
 	sInstance->clearValues(editable);
 	// update all panels with values from simulator
 	sInstance->mPanelMediaSettingsGeneral->
@@ -204,7 +207,7 @@ void LLFloaterMediaSettings::commitFields()
 	if (hasFocus())
 	{
 		LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
-		if (cur_focus->acceptsTextInput())
+		if (cur_focus && cur_focus->acceptsTextInput())
 		{
 			cur_focus->onCommit();
 		};