From db4794408ccc0c58d444f77284de31817c404209 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 2 Jun 2010 05:11:16 -0700
Subject: Clarified the simulator version change chat message with some text

---
 linden/indra/newview/llviewermessage.cpp                 | 4 +++-
 linden/indra/newview/skins/default/xui/en-us/strings.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 215630d..35fd669 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3452,8 +3452,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
 		if (gSavedSettings.getBOOL("ServerVersionChangedChat"))
 		{
+			LLStringUtil::format_map_t args;
+			args["[SERVER_VERSION_INFO]"] = version_channel;
 			LLChat chat;
-			chat.mText = version_channel;
+			chat.mText = LLTrans::getString("server_version_changed_chat", args);
 			LLFloaterChat::addChat(chat, FALSE, FALSE);
 		}
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 91b2f6d..6a58ff4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -8,6 +8,7 @@
   <!-- Imprudence-specific strings -->
   <string name="landmark_created">You created a landmark at</string>
   <string name="new_home_page">Your new Home Page is</string>
+  <string name="server_version_changed_chat">The region you have entered is running a different simulator version: [SERVER_VERSION_INFO]</string>
   <string name="hippo_label_free">free</string>
   <string name="hippo_label_week">week</string>
 
-- 
cgit v1.1