From 731283aa0bd3108b84cdb827968fa92357875e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Fri, 27 Mar 2020 00:51:45 -0400
Subject: [PATCH] Friendship accepted notifications as tips with linked names

---
 indra/newview/llimprocessing.cpp                        | 2 +-
 indra/newview/skins/default/xui/en-us/notifications.xml | 4 ++--
 indra/newview/skins/default/xui/fr/notifications.xml    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 226ab7769..5f30bcf94 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1842,7 +1842,7 @@ void LLIMProcessing::processNewMessage(const LLUUID& from_id,
 			strings.push_back(from_id.asString());
 			send_generic_message("requestonlinenotification", strings);
 			
-			args["NAME"] = name;
+			args["NAME"] = LLAvatarActions::getSLURL(from_id);
 			LLSD payload;
 			payload["from_id"] = from_id;
 			LLAvatarNameCache::get(from_id, boost::bind(&notification_display_name_callback, _1, _2, "FriendshipAccepted", args, payload));
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 53bfad2b9..101dbabcf 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7862,7 +7862,7 @@ Offer a teleport?
    icon="notify.tga"
    name="FriendshipAccepted"
    log_to_im="true"   
-   type="notify">
+   type="notifytip">
     <tag>friendship</tag>
 [NAME] accepted your friendship offer.
   </notification>
@@ -7872,7 +7872,7 @@ Offer a teleport?
    name="FriendshipDeclined"
    log_to_im="true"   
    persist="true"
-   type="notify">
+   type="notifytip">
     <tag>friendship</tag>
 [NAME] declined your friendship offer.
   </notification>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index d141ac555..2d8e0d1e2 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -3386,11 +3386,11 @@ L'objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(
 	</notification>
 
 	<notification name="FriendshipAccepted">
-[NAME_SLURL] a accepté votre amitié. [MESSAGE]
+[NAME] a accepté votre amitié.
 	</notification>
 
 	<notification name="FriendshipDeclined">
-[NAME_SLURL] a refusé votre amitié. [MESSAGE]
+[NAME] a refusé votre amitié.
 	</notification>
 
 	<notification name="OfferCallingCard">