Automated merge with tip of viewer-release after Viewer Media Update release

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 4fd5c0587a..2afd889609 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -171,8 +171,12 @@ void LLFloaterMediaSettings::onClose(bool app_quitting)
 void LLFloaterMediaSettings::initValues( const LLSD& media_settings, bool editable )
 {
 	if (sInstance->hasFocus()) return;
-	
-	sInstance->clearValues(editable);
+
+	// Clear values
+	sInstance->mPanelMediaSettingsGeneral->clearValues(sInstance->mPanelMediaSettingsGeneral, editable, false /*don't update preview*/);
+	sInstance->mPanelMediaSettingsSecurity->clearValues(sInstance->mPanelMediaSettingsSecurity,	editable);
+	sInstance->mPanelMediaSettingsPermissions->clearValues(sInstance->mPanelMediaSettingsPermissions,  editable);
+
 	// update all panels with values from simulator
 	sInstance->mPanelMediaSettingsGeneral->
 		initValues( sInstance->mPanelMediaSettingsGeneral, media_settings, editable );