diff options
| author | Richard Linden <none@none> | 2010-11-08 19:27:24 -0800 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-08 19:27:24 -0800 | 
| commit | 8daea83c98d57e7c063bf9287b1e9c0cd720d337 (patch) | |
| tree | 4af322c78e390283ec7773592325fbb3281343a7 /indra/llui | |
| parent | 197f09f1ea7c634d619a3d87d65f6e929611c511 (diff) | |
EXP-421 FIX Notifications tab in Preferences not working properly
fixed logic so that ignore consistently means *don't show* the notification
the ignore settings still store "show the notification if true" values
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 3dba2d2b83..d6d3672784 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -219,7 +219,7 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica  		}  		else  		{ -			LLUI::sSettingGroups["ignores"]->declareBOOL(name, show_notification, "Ignore notification with this name", TRUE); +			LLUI::sSettingGroups["ignores"]->declareBOOL(name, show_notification, "Show notification with this name", TRUE);  			mIgnoreSetting = LLUI::sSettingGroups["ignores"]->getControl(name);  		}  	} @@ -357,15 +357,15 @@ LLControlVariablePtr LLNotificationForm::getIgnoreSetting()  bool LLNotificationForm::getIgnored()  { -	bool ignored = false; +	bool show = false;  	if (mIgnore != LLNotificationForm::IGNORE_NO  		&& mIgnoreSetting)   	{ -		ignored = mIgnoreSetting->getValue().asBoolean(); -		if (mInvertSetting) ignored = !ignored; +		show = mIgnoreSetting->getValue().asBoolean(); +		if (mInvertSetting) show = !show;  	} -	return ignored; +	return !show;  }  void LLNotificationForm::setIgnored(bool ignored) @@ -373,7 +373,7 @@ void LLNotificationForm::setIgnored(bool ignored)  	if (mIgnoreSetting)  	{  		if (mInvertSetting) ignored = !ignored; -		mIgnoreSetting->setValue(ignored); +		mIgnoreSetting->setValue(!ignored);  	}  } | 
