diff options
| author | Richard Linden <none@none> | 2010-11-08 15:40:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-08 15:40:27 -0800 |
| commit | 197f09f1ea7c634d619a3d87d65f6e929611c511 (patch) | |
| tree | 304965e7c752f79bc2ca614d64025b2be094aa4b /indra | |
| parent | 451d115c1009ded2b2d74efefbe0611c62343eed (diff) | |
EXP-421 FIX Notifications tab in Preferences not working properly
reverted to old sense where ignore setting of notifications has meaning true=show false=ignore
reviewed by Callum
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index dd6c632d10..3dba2d2b83 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -64,7 +64,7 @@ LLNotificationForm::FormElementBase::FormElementBase() LLNotificationForm::FormIgnore::FormIgnore() : text("text"), control("control"), - invert_control("invert_control", true), + invert_control("invert_control", false), save_option("save_option", false) {} @@ -194,7 +194,7 @@ LLNotificationForm::LLNotificationForm() LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotificationForm::Params& p) : mIgnore(IGNORE_NO), - mInvertSetting(true) // ignore settings by default mean true=show, false=ignore + mInvertSetting(false) // ignore settings by default mean true=show, false=ignore { if (p.ignore.isProvided()) { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 83cbcb3344..9f98823c01 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6532,7 +6532,7 @@ Mute everyone? <form name="form"> <ignore name="ignore" control="MediaEnablePopups" - invert_control="false" + invert_control="true" text="Enable all pop-ups"/> <button default="true" index="0" |