livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "SL-13824 Remove notification when joining a group" 

This reverts commit fc74a2df63.
meow-7.2.2
Mnikolenko Productengine 2020-09-23 12:31:25 +03:00
parent baf77b4dd0
commit be233707e1
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llviewermessage.cpp
View File

@ -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);

12
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -1022,6 +1022,18 @@ The group no longer has open enrollment.
yestext="OK"/>
</notification>
<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"