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

STORM-1838 merge

meow-7.2.2
Jonathan Yap 2013-07-29 13:53:35 -04:00
parent f81e2ce680 9e5dbcfde5
commit 8a761f9227
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llavataractions.cpp
View File

@ -443,13 +443,9 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const
// static
void LLAvatarActions::teleportRequest(const LLUUID& id)
{
std::string name;
gCacheName->getFullName(id, name);
gCacheName->cleanFullName(name);
LLSD notification;
notification["uuid"] = id;
notification["NAME"] = name + "'s";
notification["NAME_SLURL"] = LLSLURL("agent", id, "about").getSLURLString();
LLSD payload;

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

@ -4035,7 +4035,7 @@ Join me in [REGION]
icon="alertmodal.tga"
name="TeleportRequestPrompt"
type="alertmodal">
Request a teleport to [NAME] location with the following message
Request a teleport to [NAME_SLURL] with the following message
<tag>confirm</tag>
<form name="form">
<input name="message" type="text">