summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-17 17:29:12 -0700
committerRichard Linden <none@none>2010-09-17 17:29:12 -0700
commit2deaa895de081982f4191db0810aa470da5348a2 (patch)
treea05087bd4901b9f52ea0c8c9825539665cbf9fcd /indra/llui/llnotifications.cpp
parent1c3b38cace6d3a673c83230f6f3f20b430738042 (diff)
parenta67acc2afa3e7369cb0ee29fcca0048f1b4eb23f (diff)
merge
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rw-r--r--indra/llui/llnotifications.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 6a0d64e876..2a7ca4c321 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -618,8 +618,7 @@ void LLNotification::respond(const LLSD& response)
if (mForm->getIgnoreType() != LLNotificationForm::IGNORE_NO)
{
- bool show_notification = !mIgnored;
- mForm->setIgnored(!show_notification);
+ mForm->setIgnored(mIgnored);
if (mIgnored && mForm->getIgnoreType() == LLNotificationForm::IGNORE_WITH_LAST_RESPONSE)
{
LLUI::sSettingGroups["ignores"]->setLLSD("Default" + getName(), response);
@@ -745,6 +744,8 @@ void LLNotification::init(const std::string& template_name, const LLSD& form_ele
// apply substitution to form labels
mForm->formatElements(mSubstitutions);
+ mIgnored = mForm->getIgnored();
+
LLDate rightnow = LLDate::now();
if (mTemplatep->mExpireSeconds)
{