diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-11-10 14:26:17 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-11-10 14:26:17 -0500 |
| commit | d1e3062ae4b9fa182ea4942117fd37579261fc8c (patch) | |
| tree | 0c9f737c835d6ee4f8faaf02f026fc4703f08183 /indra/newview/llfloatermediasettings.cpp | |
| parent | 37806fe4b2c0a83a5e8b1b2e9b7f260da494488e (diff) | |
| parent | 033d61ddb312080dc986803f6c1921cbd554c598 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatermediasettings.cpp')
| -rw-r--r-- | indra/newview/llfloatermediasettings.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp index d941f24f49..44e68d7745 100644 --- a/indra/newview/llfloatermediasettings.cpp +++ b/indra/newview/llfloatermediasettings.cpp @@ -145,13 +145,18 @@ LLFloaterMediaSettings* LLFloaterMediaSettings::getInstance() //static void LLFloaterMediaSettings::apply() { - LLSD settings; + sInstance->mPanelMediaSettingsGeneral->preApply(); sInstance->mPanelMediaSettingsGeneral->getValues( settings ); - sInstance->mPanelMediaSettingsSecurity->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(); } //////////////////////////////////////////////////////////////////////////////// |