diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-03-01 19:38:21 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-03-01 19:38:21 -0500 |
| commit | 12ccb65603ec50ac80d85c4e023ec8e026c9e1f2 (patch) | |
| tree | f7bfc4b64718278041f46e1759f5de27c9d83864 /indra/newview/llfloatermediasettings.cpp | |
| parent | 2e87bac8f9983faa6a1e46ee626d688a101fa070 (diff) | |
| parent | 3c7086d4fff6c370f8ce2be51cab2502f663aab1 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-451
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 ); |