Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Friendship accepted notifications as tips with linked names

Browse Source
This commit is contained in:
Liru Færs
2020-03-27 00:51:45 -04:00
parent 89ce328ba5
commit 731283aa0b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llimprocessing.cpp
View File

@@ -1842,7 +1842,7 @@ void LLIMProcessing::processNewMessage(const LLUUID& from_id,
strings.push_back(from_id.asString()); strings.push_back(from_id.asString());
send_generic_message("requestonlinenotification", strings); send_generic_message("requestonlinenotification", strings);
args["NAME"] = name; args["NAME"] = LLAvatarActions::getSLURL(from_id);
LLSD payload; LLSD payload;
payload["from_id"] = from_id; payload["from_id"] = from_id;
LLAvatarNameCache::get(from_id, boost::bind(&notification_display_name_callback, _1, _2, "FriendshipAccepted", args, payload)); LLAvatarNameCache::get(from_id, boost::bind(&notification_display_name_callback, _1, _2, "FriendshipAccepted", args, payload));

4
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -7862,7 +7862,7 @@ Offer a teleport?
icon="notify.tga" icon="notify.tga"
name="FriendshipAccepted" name="FriendshipAccepted"
log_to_im="true" log_to_im="true"
type="notify"> type="notifytip">
<tag>friendship</tag> <tag>friendship</tag>
[NAME] accepted your friendship offer. [NAME] accepted your friendship offer.
</notification> </notification>
@@ -7872,7 +7872,7 @@ Offer a teleport?
name="FriendshipDeclined" name="FriendshipDeclined"
log_to_im="true" log_to_im="true"
persist="true" persist="true"
type="notify"> type="notifytip">
<tag>friendship</tag> <tag>friendship</tag>
[NAME] declined your friendship offer. [NAME] declined your friendship offer.
</notification> </notification>

4
indra/newview/skins/default/xui/fr/notifications.xml
View File

@@ -3386,11 +3386,11 @@ L'objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(
</notification> </notification>
<notification name="FriendshipAccepted"> <notification name="FriendshipAccepted">
[NAME_SLURL] a accepté votre amitié. [MESSAGE] [NAME] a accepté votre amitié.
</notification> </notification>
<notification name="FriendshipDeclined"> <notification name="FriendshipDeclined">
[NAME_SLURL] a refusé votre amitié. [MESSAGE] [NAME] a refusé votre amitié.
</notification> </notification>
<notification name="OfferCallingCard"> <notification name="OfferCallingCard">