From 27ac50b1a1a7d5ceb2ece1851a9e9eb69f53a3c1 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 2 Mar 2010 18:54:37 +0200 Subject: Work on normal sub-task EXT-5886 ([HARD CODED] - System message "Teleport completed from" needs translation) - moved hard coded string into teleport_strings.xml (name="completed_from") --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') 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 -- cgit v1.2.3