aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-02 05:11:16 -0700
committerJacek Antonelli2010-06-19 02:43:28 -0500
commitdb4794408ccc0c58d444f77284de31817c404209 (patch)
treeea52c5561dc9d2a6a381a1366d62e3736c451ead /linden/indra
parentFixed #180: Grid manager fails to autofill grid info if the port doesn't end ... (diff)
downloadmeta-impy-db4794408ccc0c58d444f77284de31817c404209.zip
meta-impy-db4794408ccc0c58d444f77284de31817c404209.tar.gz
meta-impy-db4794408ccc0c58d444f77284de31817c404209.tar.bz2
meta-impy-db4794408ccc0c58d444f77284de31817c404209.tar.xz
Clarified the simulator version change chat message with some text
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llviewermessage.cpp4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/strings.xml1
2 files changed, 4 insertions, 1 deletions
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**)
3452 3452
3453 if (gSavedSettings.getBOOL("ServerVersionChangedChat")) 3453 if (gSavedSettings.getBOOL("ServerVersionChangedChat"))
3454 { 3454 {
3455 LLStringUtil::format_map_t args;
3456 args["[SERVER_VERSION_INFO]"] = version_channel;
3455 LLChat chat; 3457 LLChat chat;
3456 chat.mText = version_channel; 3458 chat.mText = LLTrans::getString("server_version_changed_chat", args);
3457 LLFloaterChat::addChat(chat, FALSE, FALSE); 3459 LLFloaterChat::addChat(chat, FALSE, FALSE);
3458 } 3460 }
3459 3461
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 @@
8 <!-- Imprudence-specific strings --> 8 <!-- Imprudence-specific strings -->
9 <string name="landmark_created">You created a landmark at</string> 9 <string name="landmark_created">You created a landmark at</string>
10 <string name="new_home_page">Your new Home Page is</string> 10 <string name="new_home_page">Your new Home Page is</string>
11 <string name="server_version_changed_chat">The region you have entered is running a different simulator version: [SERVER_VERSION_INFO]</string>
11 <string name="hippo_label_free">free</string> 12 <string name="hippo_label_free">free</string>
12 <string name="hippo_label_week">week</string> 13 <string name="hippo_label_week">week</string>
13 14