1 files changed, 46 insertions, 44 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index a164f78..726fd26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -19,22 +19,43 @@
                  label="Disable teleport screen" left="12" mouse_opaque="true"
                  name="disable_tp_screen_check" radio_style="false" width="217" />
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
+          font="SansSerifSmall" height="16" initial_value="false"
+          label="Show client names in nametags" left="12" mouse_opaque="true"
+          name="client_name_tag_check" radio_style="false" width="160" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show client names with color" left_delta="0" mouse_opaque="true"
+           name="client_name_color_check" radio_style="false" width="160" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Show client names in nametag" left="12" mouse_opaque="true"
-           name="client_name_tag_check" radio_style="false" width="217" />
+           label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
+           name="client_name_hover_check" radio_style="false" width="160" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Broadcast your client name to others" left="12" mouse_opaque="true"
+           label="Show your client name to others" left_delta="0" mouse_opaque="true"
            name="client_name_tag_broadcast_check" radio_style="false" width="217" />
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
            label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
            name="shadows_check" radio_style="false" width="217" />
+      <text bottom_delta="-25" left="16" height="15" width="300"
+           follows="top|left">
+          Allow region WindLight settings (LightShare):
+      </text>
+      <combo_box name="lightshare_combo"
+                 bottom_delta="-2" left_delta="250" height="18" width="120"
+                 allow_text_entry="false" follows="left|top">
+        <combo_item type="string" name="never" value="0">
+          Never
+        </combo_item>
+        <combo_item type="string" name="ask" value="1">
+          Ask me every time
+        </combo_item>
+        <combo_item type="string" name="always" value="2">
+          Always
+        </combo_item>
+      </combo_box>
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="true"
-           label="Use server-side WindLight settings" left="12" mouse_opaque="true"
-           name="windlight_check" radio_style="false" width="217" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
            label="Use HTTP texture fetching" left="12" mouse_opaque="true"
            name="http_texture_check" radio_style="false" width="217" />
@@ -67,43 +88,24 @@
            mouse_opaque="true" name="language_is_public"
            radio_style="false" tool_tip="This lets in-world objects know your preferred language."
            width="256" />
-
-  <text bottom_delta="-25" left="16" height="15" width="300"
-        follows="top|left">
-    Allow region WindLight settings (LightShare):
-  </text>
-  <combo_box name="lightshare_combo"
-             bottom_delta="-2" left_delta="250" height="18" width="120"
-             allow_text_entry="false" follows="left|top">
-    <combo_item type="string" name="never" value="0">
-      Never
-    </combo_item>
-    <combo_item type="string" name="ask" value="1">
-      Ask me every time
-    </combo_item>
-    <combo_item type="string" name="always" value="2">
-      Always
-    </combo_item>
-  </combo_box>
-
-  <check_box bottom_delta="-25" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-       initial_value="false" label="Use MU* pose style chat and IM" left="12"
-       mouse_opaque="true" name="allow_mupose"
-       radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
-       width="256" />
-  <check_box bottom_delta="0" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-       initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
-       mouse_opaque="true" name="auto_close_ooc"
-       radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
-       width="256" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-       initial_value="false" label="Use the chatbar as a command line" left="12"
-       mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
-  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" width="150"
-       label="Chatbar Commands" name="command_line_btn" left="12"
-       tool_tip="Set specific chatbar command line commands here" />
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Use MU* pose style chat and IM" left="12"
+           mouse_opaque="true" name="allow_mupose"
+           radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+           width="256" />
+      <check_box bottom_delta="0" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
+           mouse_opaque="true" name="auto_close_ooc"
+           radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+           width="256" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Use the chatbar as a command line" left="12"
+           mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
+      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" width="150"
+           label="Chatbar Commands" name="command_line_btn" left="12"
+           tool_tip="Set specific chatbar command line commands here" />
 
   <!-- Uncomment when we start using the crash logger - MC -->
   <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"