summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-09-23 12:31:25 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-09-23 12:31:25 +0300
commitbe233707e1a0a4246be8fabe17419476deec8949 (patch)
tree8f8816b94bd5bf997c4d2b159a6c5e868e8f87ee /indra/newview
parentbaf77b4dd01d036b77d635c19c7113bcac2dc6ec (diff)
Revert "SL-13824 Remove notification when joining a group"
This reverts commit fc74a2df6364889149b5ebd0638839582fda358f.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermessage.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml12
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e78ace061e..06a8ebbe89 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -777,6 +777,7 @@ void response_group_invitation_coro(std::string url, LLUUID group_id, bool notif
LL_DEBUGS("GroupInvite") << "Successfully sent response to group " << group_id << " invitation" << LL_ENDL;
if (notify_and_update)
{
+ LLNotificationsUtil::add("JoinGroupSuccess");
gAgent.sendAgentDataUpdateRequest();
LLGroupMgr::getInstance()->clearGroupData(group_id);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fa1c15c411..32ae56e3af 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1024,6 +1024,18 @@ The group no longer has open enrollment.
<notification
icon="alertmodal.tga"
+ name="JoinGroupSuccess"
+ type="alertmodal">
+You have been added to the group
+ <tag>group_id</tag>
+ <tag>success</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="JoinGroupInsufficientFunds"
type="alertmodal">
Unable to transfer the required L$ [membership_fee] membership fee.