summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-14 12:01:40 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-14 12:01:40 -0700
commitb049db546a5970d268014f3d0d5375834cdaf59d (patch)
tree6cda035a4ed62c7f2f391869ca743d13fbc06775 /indra
parent330ea83c3dd8f56f4cef56481f951b705d28f027 (diff)
DN-177 Cannot click on Name in Friend Request to view profile - and no profile pic in friend request
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermessage.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 4e40b706a0..9b1f2e67c6 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2876,7 +2876,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
else
{
- args["NAME"] = LLSLURL("agent", from_id, "about").getSLURLString();
+ args["NAME_SLURL"] = LLSLURL("agent", from_id, "about").getSLURLString();
if(message.empty())
{
//support for frienship offers from clients before July 2008
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7e9cc6772d..34e2b2410e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5457,7 +5457,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC
icon="notify.tga"
name="OfferFriendship"
type="offer">
-[NAME] is offering friendship.
+[NAME_SLURL] is offering friendship.
[MESSAGE]
@@ -5486,7 +5486,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC
name="OfferFriendshipNoMessage"
persist="true"
type="notify">
-[NAME] is offering friendship.
+[NAME_SLURL] is offering friendship.
(By default, you will be able to see each other&apos;s online status.)
<form name="form">