summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llviewermessage.cpp9
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml7
2 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 9c56766d0d..e78ace061e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5036,15 +5036,6 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
// notification was specified using the new mechanism, so we can just handle it here
std::string notificationID;
msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID);
-
- //SL-13824 skip notification when both joining a group and leaving a group
- //remove this after server stops sending these messages
- if (notificationID == "JoinGroupSuccess" ||
- notificationID == "GroupDepart")
- {
- return true;
- }
-
if (!LLNotifications::getInstance()->templateExists(notificationID))
{
return false;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d141cfc313..fa1c15c411 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4214,6 +4214,13 @@ Leave Group?
yestext="OK"/>
</notification>
+ <notification
+ icon="notify.tga"
+ name="GroupDepart"
+ type="notify">
+You have left the group &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;.
+ <tag>group</tag>
+ </notification>
<notification
icon="alertmodal.tga"