summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-02-08 02:03:28 +0000
committerCho <cho@lindenlab.com>2013-02-08 02:03:28 +0000
commitc55e4a61242cd3cf94e0a28398fd33a4eb8ea683 (patch)
treeabf3e7749d69de6ae0fc6d21fef7f428abc8bc69 /indra/newview
parent3016afcd0623d8c086cfee36ebf5a0b3210c6fa5 (diff)
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation
Changed LLPersistentNotificationStorage::saveNotification() to use notification->asLLSD(true) to skip duplicates Changed LLDockControl::mDockWidget to be a LLHandle<LLView> instead of a LLView* to fix crash (from accessing deleted LLView)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpersistentnotificationstorage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpersistentnotificationstorage.cpp b/indra/newview/llpersistentnotificationstorage.cpp
index 224aaa2146..11c12e6c10 100644
--- a/indra/newview/llpersistentnotificationstorage.cpp
+++ b/indra/newview/llpersistentnotificationstorage.cpp
@@ -75,7 +75,7 @@ void LLPersistentNotificationStorage::saveNotifications()
continue;
}
- data.append(notification->asLLSD());
+ data.append(notification->asLLSD(true));
}
writeNotifications(output);