From 73a53aa64328f1b48fa09286120609b7297985e3 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 17 May 2010 09:13:46 -0700
Subject: DEV-50013 Rename "SLID" to "Username" at Product's request

---
 indra/newview/app_settings/settings.xml                          | 2 +-
 indra/newview/skins/default/xui/en/panel_login.xml               | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f8ad1c2dac..6a68f72bb5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7340,7 +7340,7 @@
     <key>NameTagShowSLIDs</key>
     <map>
       <key>Comment</key>
-      <string>Show Second Life IDs in name labels</string>
+      <string>Show usernames in avatar name tags</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 21846f6e87..88c264c649 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -60,7 +60,7 @@ name="username_text"
 top="20"
 left="20"
 width="150">
-Second Life ID or Name:
+Username:
 </text>
 <line_editor
 follows="left|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 131d9312af..b09ac4d0fa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -290,10 +290,10 @@
      control_name="NameTagShowSLIDs"
 	 enabled_control="AvatarNameTagMode"
      height="16"
-     label="Second Life IDs"
+     label="Usernames"
      left_delta="0"
      name="show_slids"
-	 tool_tip="Show SL ID, like bobsmith123"
+     tool_tip="Show username, like bobsmith123"
      top_pad="5" />
     <text
      type="string"
-- 
cgit v1.3