diff options
author | Rider Linden <rider@lindenlab.com> | 2018-03-07 11:27:43 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-03-07 11:27:43 -0800 |
commit | 7b56db31f91545102744885b4f70c93278e837bd (patch) | |
tree | 97bd880e3aeb1f60d667344e6693b46c8ba120eb /indra/newview/llfloatermediasettings.cpp | |
parent | 4235231b5adbb7f064cab732f761dd359ef4b648 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloatermediasettings.cpp')
-rw-r--r-- | indra/newview/llfloatermediasettings.cpp | 8 |
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 ); |