Merge

5 files changed, 17 insertions, 8 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bb43de6ada..bfa57892a7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -550,7 +550,7 @@
      reference="White" />
     <color
      name="NameTagMismatch"
-     value="1 0.776 0.212 1" />
+     reference="White" />
     <color
      name="NameTagSLID"
      value="1 1 1 1" />
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 1d67123726..420ba172e8 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,7 +8,7 @@
  layout="topleft"
  name="incoming call"
  help_topic="incoming_call"
- title="UNKNOWN PERSON IS CALLING"
+ title="Incoming call"
  width="410">
     <floater.string
      name="lifetime">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b0f5daef14..7839d61299 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3170,7 +3170,7 @@ Thanks for updating your name!
 
 Just like in real life, it takes a while for everyone to learn about a new name.  Please allow [HOURS] hours for your name to update in object ownership, scripts, search, etc.
 
-See http://wiki.secondlife.com/wiki/Display_Names for details.
+See http://wiki.secondlife.com/wiki/Setting_your_display_name for details.
   </notification>
 
   <notification
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..eabbdc2186 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -256,7 +256,16 @@
      name="show_my_name_checkbox1"
 	 top_pad="4"
      width="300" />
-   <text
+  <check_box
+    control_name="NameTagShowFriends"
+    enabled_control="AvatarNameTagMode"
+    height="16"
+    label="Highlight friends"
+    left_delta="0"
+    name="show_friends"
+    tool_tip="Highlight the name tags of your friends"
+    top_pad="2" />
+  <text
     follows="left|top"
     height="15"
 	layout="topleft"
@@ -287,13 +296,13 @@
      top_pad="5" />
      -->
    <check_box
-     control_name="NameTagShowSLIDs"
+     control_name="NameTagShowUsernames"
 	 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"