summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermediasettings.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2010-03-08 14:54:54 -0800
committerskolb <none@none>2010-03-08 14:54:54 -0800
commit78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch)
tree0c471654bd00737375e91f040d758716c82bffb2 /indra/newview/llfloatermediasettings.cpp
parentf39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff)
parent2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff)
Local merge
Diffstat (limited to 'indra/newview/llfloatermediasettings.cpp')
-rw-r--r--indra/newview/llfloatermediasettings.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 62ec17f89a..ee68faf84b 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -242,6 +242,12 @@ void LLFloaterMediaSettings::onBtnApply( void* userdata )
sInstance->commitFields();
sInstance->apply();
+
+ sInstance->mInitialValues.clear();
+ sInstance->mPanelMediaSettingsGeneral->getValues( sInstance->mInitialValues );
+ sInstance->mPanelMediaSettingsSecurity->getValues( sInstance->mInitialValues );
+ sInstance->mPanelMediaSettingsPermissions->getValues( sInstance->mInitialValues );
+
}
////////////////////////////////////////////////////////////////////////////////