diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-09-23 12:31:18 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-09-23 12:31:18 +0300 |
| commit | baf77b4dd01d036b77d635c19c7113bcac2dc6ec (patch) | |
| tree | 6e769b20893231371630d5be864a25d67bb88f3a | |
| parent | 10a2519e737d2fc4be74e7bb289d0b3eb0709aa0 (diff) | |
Revert "SL-13824 Remove notification when both joining a group and leaving a group"
This reverts commit 34786ac22129aac372eeb1e73b6baac6bfad644e.
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
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 '<nolink>[group_name]</nolink>'. + <tag>group</tag> + </notification> <notification icon="alertmodal.tga" |