diff options
| author | Palmer <palmer@lindenlab.com> | 2010-03-05 13:11:26 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-03-05 13:11:26 -0800 |
| commit | b70951ca1e319e4d4a427a559072ee722588e1ed (patch) | |
| tree | 59f8edc208a98a3f74586a0458417a1ce14c00ff /indra/newview/llviewermessage.cpp | |
| parent | dd663449b6f8b802892e11fab7cc2cbce36f734f (diff) | |
| parent | 32aa06139e6fb5f2e84d3e657dfbe8961170a804 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ae31c9732c..361f4e2326 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3115,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 |