diff options
| author | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
| commit | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch) | |
| tree | 0c471654bd00737375e91f040d758716c82bffb2 /indra/newview/llviewermessage.cpp | |
| parent | f39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff) | |
| parent | 2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff) | |
Local merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b36f58f8ff..361f4e2326 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -207,6 +207,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) LLNotificationsUtil::add("FriendshipDeclinedByMe", notification["substitutions"], payload); } + // fall-through case 2: // Send IM - decline and start IM session { // decline @@ -3114,8 +3115,12 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) { // Chat the "back" SLURL. (DEV-4907) + LLSD substitution = LLSD().with("[T_SLURL]", gAgent.getTeleportSourceSLURL()); + std::string completed_from = LLAgent::sTeleportProgressMessages["completed_from"]; + LLStringUtil::format(completed_from, substitution); + LLSD args; - args["MESSAGE"] = "Teleport completed from " + gAgent.getTeleportSourceSLURL(); + args["MESSAGE"] = completed_from; LLNotificationsUtil::add("SystemMessageTip", args); // Set the new position |