SL-15297 WIP Implement performance floater - updated UI

6 files changed, 406 insertions, 423 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 42269ba34a..09af364266 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -1,409 +1,387 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="550"
+ height="590"
  layout="topleft"
  name="performance"
  save_rect="true"
  title="IMPROVE GRAPHICS SPEED"
  width="580">
+  <string
+     name="very_high"
+     value="very high"/>
+  <string
+     name="medium"
+     value="medium"/>
   <panel
    bevel_style="none"
    follows="left|top"
-   height="490"
+   height="540"
    width="580"
-   name="panel_performance_main"
+   name="panel_top"
    visible="true"
    layout="topleft"
    left="0"   
    top="0">
-    <text
+    <panel
+     bg_alpha_color="black"
+     background_visible="true"
+     background_opaque="false"
+     border="false"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerifHuge"
-     text_color="White"
-     height="20"
+     height="40"
+     width="560"
+     name="fps_subpanel"
      layout="topleft"
      left="10"
-     name="fps_lbl"
-     top="17"
-     width="130">
-        Current FPS
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerifHugeBold"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     name="fps_value"
-     width="100">
-        75.2
-    </text>
-  
-    <icon
-     height="16"
-     width="16"
-     image_name="Green_dot"
-     mouse_opaque="true"
-     name="icon_arrow4"
-     follows="right|top"
-     top="16"
-     right="-154"/>
-    <icon
-     height="16"
-     width="16"
-     image_name="Green_dot"
-     mouse_opaque="true"
-     name="icon_arrow4"
-     follows="right|top"
-     top_pad="9"/>
-    <icon
-     height="16"
-     width="16"
-     image_name="Green_dot"
-     mouse_opaque="true"
-     name="icon_arrow4"
-     follows="right|top"
-     top_pad="8"/>
- 
-    <text
-     follows="right|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     top="17"
-     right="-90"
-     name="client_lbl"
-     width="60">
-        Client:
-    </text>
-    <text
-     follows="right|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     top_pad="5"
-     name="client_lbl"
-     width="60">
-        Network:
-    </text>
-    <text
-     follows="right|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     top_pad="5"
-     name="client_lbl"
-     width="60">
-        Server:
-    </text>
-    <text
-     follows="right|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     right="-15"
-     name="client_value"
-     top="17"
-     width="45">
-        Normal
-    </text>
-    <text
-     follows="right|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     name="network_value"
-     top_pad="5"
-     width="45">
-        Normal
-    </text>
-    <text
-     follows="right|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     name="server_value"
-     top_pad="5"
-     width="45">
-        Normal
-    </text> 
-  <panel
-   bg_alpha_color="PerformanceFloaterGray"
-   background_visible="true"
-   background_opaque="false"
-   border="true"
-   bevel_style="none"
-   follows="left|top"
-   height="60"
-   width="560"
-   name="troubleshooting_subpanel"
-   layout="topleft"
-   left="10"
-   top="102">
-    <text
-     follows="left|top"
-     font="SansSerifLarge"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="troubleshooting_lbl"
-     top="12"
-     width="395">
-        General troubleshooting
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="troubleshooting_info"
-     top_pad="5"
-     width="395">
-        Choose among common problems and see what you can do.
-    </text>
-    <icon
-     height="16"
-     width="16"
-     image_name="Arrow_Right_Off"
-     mouse_opaque="true"
-     name="icon_arrow1"
-     follows="right|top"
-     top="24"
-     right="-20"/>
+     top="5">
+      <text
+       follows="left|top"
+       font="SansSerifHuge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="20"
+       top="8"
+       name="fps_value"
+       width="40">
+          75
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left_pad="0"
+       top="14"
+       name="fps_lbl"
+       width="450">
+          FPS -- 60 or more for the best experience
+      </text>    
+    </panel>
   </panel>
   <panel
-   bg_alpha_color="PerformanceFloaterGray"
-   background_visible="true"
-   background_opaque="false"
-   border="true"
    bevel_style="none"
    follows="left|top"
-   height="60"
-   width="560"
-   name="nearby_subpanel"
-   layout="topleft"
-   top_pad="20">
-    <text
-     follows="left|top"
-     font="SansSerifLarge"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="avatars_nearby_lbl"
-     top="12"
-     width="115">
-        Avatars nearby:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerifLarge"
-     text_color="PerformanceMid"
-     height="20"
-     layout="topleft"
-     left_pad="3"
-     name="avatars_nearby_value"
-     width="100">
-        42 (very high)
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="avatars_nearby_info"
-     top_pad="5"
-     width="395">
-        Click to review avatars and choose a complexity limit.
-    </text>
-    <icon
-     height="16"
-     width="16"
-     image_name="Arrow_Right_Off"
-     mouse_opaque="true"
-     name="icon_arrow2"
-     follows="right|top"
-     top="24"
-     right="-20"/>
-  </panel>
-  <panel
-   bg_alpha_color="PerformanceFloaterGray"
-   background_visible="true"
-   background_opaque="false"
-   border="true"
-   bevel_style="none"
-   follows="left|top"
-   height="60"
-   width="560"
-   name="preferences_subpanel"
-   layout="topleft"
-   top_pad="20">
-    <text
-     follows="left|top"
-     font="SansSerifLarge"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="complexity_lbl"
-     top="12"
-     width="110">
-        This location is
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerifLarge"
-     text_color="PerformanceMid"
-     height="20"
-     layout="topleft"
-     left_pad="3"
-     name="complexity_value"
-     width="100">
-        very complex
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     text_color="White"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="complexity_info"
-     top_pad="5"
-     width="395">
-        Try changing graphics quality or draw distance.
-    </text>
-    <icon
-     height="16"
-     width="16"
-     image_name="Arrow_Right_Off"
-     mouse_opaque="true"
-     name="icon_arrow3"
-     follows="right|top"
-     top="24"
-     right="-20"/>
-  </panel>
-  <panel
-   bg_alpha_color="PerformanceFloaterGray"
-   background_visible="true"
-   background_opaque="false"
-   border="true"
-   bevel_style="none"
-   follows="left|top"
-   height="60"
-   width="560"
-   name="scripts_subpanel"
+   height="540"
+   width="580"
+   name="panel_performance_main"
+   visible="true"
    layout="topleft"
-   top_pad="20">
-    <text
+   left="0"   
+   top="60">
+    <panel
+     bg_alpha_color="PerformanceFloaterGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerifLarge"
-     text_color="White"
-     height="20"
+     height="60"
+     width="560"
+     name="presets_subpanel"
      layout="topleft"
      left="10"
-     name="scripts_lbl"
-     top="12"
-     width="88">
-        Your avatar:
-    </text>
-    <text
+     top="5">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="presets_lbl"
+       top="12"
+       width="395">
+          Quick settings for common situations
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="presets_desc"
+       top_pad="5"
+       width="395">
+          Choose settings for parties, exploration, photography, and more.
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow1"
+       follows="right|top"
+       top="24"
+       right="-20"/>
+    </panel>
+    <panel
+     bg_alpha_color="PerformanceFloaterGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerifLarge"
-     text_color="PerformanceMid"
-     height="20"
+     height="60"
+     width="560"
+     name="settings_subpanel"
      layout="topleft"
-     left_pad="2"
-     name="scripts_value"
-     width="100">
-        12 scripts
-    </text>
-    <text
+     top_pad="20">
+        <text
+         follows="left|top"
+         font="SansSerifLarge"
+         text_color="White"
+         height="20"
+         layout="topleft"
+         left="10"
+         name="settings_lbl"
+         top="12"
+         width="180">
+          Individual settings
+        </text>
+        <text
+         follows="left|top"
+         font="SansSerif"
+         text_color="White"
+         height="20"
+         layout="topleft"
+         left="10"
+         name="settings_desc"
+         top_pad="5"
+         width="395">
+          More control over quality, visibility distance, and enhancements.
+        </text>
+        <icon
+         height="16"
+         width="16"
+         image_name="Arrow_Right_Off"
+         mouse_opaque="true"
+         name="icon_arrow3"
+         follows="right|top"
+         top="24"
+         right="-20"/>
+      </panel>
+    <panel
+     bg_alpha_color="PerformanceFloaterGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerif"
-     text_color="White"
-     height="20"
+     height="60"
+     width="560"
+     name="nearby_subpanel"
      layout="topleft"
-     left="10"
-     name="scripts_info"
-     top_pad="5"
-     width="395">
-        Removing high-impact attachments may improve graphics speed.
-    </text>
-    <icon
-     height="16"
-     width="16"
-     image_name="Arrow_Right_Off"
-     mouse_opaque="true"
-     name="icon_arrow4"
-     follows="right|top"
-     top="24"
-     right="-20"/>
-  </panel>
-  <panel
-   bg_alpha_color="PerformanceFloaterGray"
-   background_visible="true"
-   background_opaque="false"
-   border="true"
-   bevel_style="none"
-   follows="left|top"
-   height="60"
-   width="560"
-   name="huds_subpanel"
-   layout="topleft"
-   top_pad="20">
-    <text
+     top_pad="20">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="avatars_nearby_lbl"
+       top="12"
+       width="205">
+          Nearby avatar complexity is
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="PerformanceMid"
+       height="20"
+       layout="topleft"
+       left_pad="5"
+       name="avatars_nearby_value"
+       width="100">
+          very high
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="avatars_nearby_desc"
+       top_pad="5"
+       width="395">
+          Choose which avatars are not displayed in detail, to increase FPS.
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow2"
+       follows="right|top"
+       top="24"
+       right="-20"/>
+    </panel>
+    <panel
+     bg_alpha_color="PerformanceFloaterGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerifLarge"
-     text_color="White"
-     height="20"
+     height="60"
+     width="560"
+     name="complexity_subpanel"
      layout="topleft"
-     left="10"
-     name="huds_lbl"
-     top="12"
-     width="80">
-        Your HUDs:
-    </text>
-    <text
+     top_pad="20">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="complexity_lbl"
+       top="12"
+       width="180">
+          Your avatar complexity is
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="PerformanceMid"
+       height="20"
+       layout="topleft"
+       left_pad="5"
+       name="complexity_value"
+       width="100">
+          275
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="complexity_info"
+       top_pad="5"
+       width="455">
+          Reduce the complexity of your avatar if you aren't satisfied with current FPS.
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow4"
+       follows="right|top"
+       top="24"
+       right="-20"/>
+    </panel>
+    <panel
+     bg_alpha_color="PerformanceFloaterGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerifLarge"
-     text_color="PerformanceMid"
-     height="20"
+     height="60"
+     width="560"
+     name="huds_subpanel"
      layout="topleft"
-     left_pad="3"
-     name="huds_value"
-     width="100">
-        7
-    </text>
-    <text
+     top_pad="20">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="huds_lbl"
+       top="12"
+       width="135">
+          Your current HUDs:
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="PerformanceMid"
+       height="20"
+       layout="topleft"
+       left_pad="5"
+       name="huds_value"
+       width="100">
+          7
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="huds_desc"
+       top_pad="5"
+       width="395">
+          Removing HUDs you are not using can improve speed.
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow4"
+       follows="right|top"
+       top="24"
+       right="-20"/>
+    </panel>
+    <panel
+     bg_alpha_color="PerformanceFloaterGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
      follows="left|top"
-     font="SansSerif"
-     text_color="White"
-     height="20"
+     height="60"
+     width="560"
+     name="troubleshooting_subpanel"
      layout="topleft"
-     left="10"
-     name="huds_info"
-     top_pad="5"
-     width="395">
-        Removing HUDs you are not using can improve graphics speed.
-    </text>
-    <icon
-     height="16"
-     width="16"
-     image_name="Arrow_Right_Off"
-     mouse_opaque="true"
-     name="icon_arrow4"
-     follows="right|top"
-     top="24"
-     right="-20"/>
+     top_pad="20">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="troubleshooting_lbl"
+       top="12"
+       width="395">
+          General troubleshooting
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="troubleshooting_desc"
+       top_pad="5"
+       width="395">
+          Choose among common problems and see what you can do.
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow1"
+       follows="right|top"
+       top="24"
+       right="-20"/>
+    </panel>
   </panel>
- </panel>
   <panel
     filename="panel_performance_troubleshooting.xml"
     follows="all"
@@ -411,7 +389,7 @@
     left="0"
     name="panel_performance_troubleshooting"
     visible="false"
-    top="0" />
+    top="55" />
   <panel
     filename="panel_performance_nearby.xml"
     follows="all"
@@ -419,15 +397,15 @@
     left="0"
     name="panel_performance_nearby"
     visible="false"
-    top="0" />
+    top="55" />
   <panel
-    filename="panel_performance_scripts.xml"
+    filename="panel_performance_complexity.xml"
     follows="all"
     layout="topleft"
     left="0"
-    name="panel_performance_scripts"
+    name="panel_performance_complexity"
     visible="false"
-    top="0" />
+    top="55" />
   <panel
     filename="panel_performance_preferences.xml"
     follows="all"
@@ -435,7 +413,7 @@
     left="0"
     name="panel_performance_preferences"
     visible="false"
-    top="0" />
+    top="55" />
   <panel
     filename="panel_performance_huds.xml"
     follows="all"
@@ -443,5 +421,5 @@
     left="0"
     name="panel_performance_huds"
     visible="false"
-    top="0" />
+    top="55" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_scripts.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index e6dc4a217d..8d4512c4f7 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_scripts.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -4,7 +4,7 @@
  follows="left|top"
  height="490"
  width="580"
- name="panel_performance_scripts"
+ name="panel_performance_complexity"
  layout="topleft"
  left="0"
  top="0">
@@ -15,7 +15,7 @@
     mouse_opaque="true"
     follows="left|top"
     name="back_btn"
-    top="10"
+    top="7"
     image_selected="Arrow_Left_Off"
     image_pressed="Arrow_Left_Off"
     image_unselected="Arrow_Left_Off"
@@ -27,7 +27,7 @@
    height="20"
    layout="topleft"
    left_pad="3"
-   top="13"
+   top="10"
    name="back_lbl"
    width="40">
     Back
@@ -35,25 +35,14 @@
   <text
    follows="left|top"
    font="SansSerifLarge"
-   text_color="PerformanceMid"
+   text_color="white"
    height="20"
    layout="topleft"
    left="20"
    top_pad="10"
    name="attachments_title"
    width="195">
-    Avatar attachment scripts: 
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifLargeBold"
-   text_color="PerformanceMid"
-   height="20"
-   layout="topleft"
-   left_pad="5"
-   name="attachments_value"
-   width="70">
-    12
+    My avatar complexity 
   </text>
   <text
    follows="left|top"
@@ -65,7 +54,7 @@
    left="20"
    name="attachments_desc1"
    width="580">
-    These attachments contain scripts (embedded apps) that use memory.
+    Complex attachments require more time and memory to display.
   </text>
   <text
    follows="left|top"
@@ -77,6 +66,27 @@
    left="20"
    name="attachments_desc2"
    width="580">
-    If there are any you don't need, detaching them may improve graphics speed.
+    While you are in this location, removing the most complex ones may increase speed.
   </text>
+  <name_list
+    column_padding="0"
+    draw_stripes="true"
+    height="220"
+    follows="left|top"
+    layout="topleft"
+    name="obj_list"
+    top_pad="10"
+    width="540">
+      <name_list.columns
+       label=""
+       name="complex_visual"
+       width="90" />
+      <name_list.columns
+       label=""
+       name="complex_value"
+       width="40" />
+      <name_list.columns
+       label=""
+       name="name"/>
+  </name_list>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_huds.xml b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
index c881fadbe8..96bdf2412f 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -15,7 +15,7 @@
     mouse_opaque="true"
     follows="left|top"
     name="back_btn"
-    top="10"
+    top="7"
     image_selected="Arrow_Left_Off"
     image_pressed="Arrow_Left_Off"
     image_unselected="Arrow_Left_Off"
@@ -27,7 +27,7 @@
    height="20"
    layout="topleft"
    left_pad="3"
-   top="13"
+   top="10"
    name="back_lbl"
    width="40">
     Back
@@ -35,14 +35,14 @@
   <text
    follows="left|top"
    font="SansSerifLarge"
-   text_color="PerformanceMid"
+   text_color="White"
    height="20"
    layout="topleft"
    left="20"
    top_pad="10"
    name="huds_title"
-   width="120">
-    HUDs displayed: 
+   width="135">
+    Your current HUDs: 
   </text>
   <text
    follows="left|top"
@@ -65,7 +65,7 @@
    left="20"
    name="huds_desc1"
    width="540">
-    If there are any you don't need, detaching them may improve graphics speed.
+    Detaching HUDs you aren't using us always a good idea, but especially in a complex location.
   </text>
   <text
    follows="left|top"
@@ -100,13 +100,5 @@
          label=""
          name="name"/>
   </name_list>
-  <button
-   follows="left|top"
-   height="19"
-   label="Refresh List"
-   layout="topleft"
-   name="refresh_list_btn"
-   top_pad="20"
-   width="100" />
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
index d71b5334cd..28ffbd5c2e 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -15,7 +15,7 @@
     mouse_opaque="true"
     follows="left|top"
     name="back_btn"
-    top="10"
+    top="7"
     image_selected="Arrow_Left_Off"
     image_pressed="Arrow_Left_Off"
     image_unselected="Arrow_Left_Off"
@@ -27,7 +27,7 @@
    height="20"
    layout="topleft"
    left_pad="3"
-   top="13"
+   top="10"
    name="back_lbl"
    width="40">
     Back
@@ -35,14 +35,14 @@
   <text
    follows="left|top"
    font="SansSerifLarge"
-   text_color="PerformanceMid"
+   text_color="White"
    height="20"
    layout="topleft"
    left="20"
    top_pad="10"
    name="av_nearby_title"
-   width="215">
-    Avatars within draw distance:
+   width="205">
+    Nearby avatar complexity is
   </text>
   <text
    follows="left|top"
@@ -53,7 +53,7 @@
    left_pad="3"
    name="av_nearby_value"
    width="150">
-    42 (very high)
+    very high
   </text>
   <text
    follows="left|top"
@@ -65,7 +65,7 @@
    top_pad="5"
    name="av_nearby_desc"
    width="580">
-    Some avatars nearby are slow to display. Choosing complexity limit may help graphics speed.
+    Some avatars nearby are slow to display. Choosing a complexity limit may help graphics speed.
   </text>
   <slider
     control_name="IndirectMaxComplexity"
@@ -74,7 +74,8 @@
     height="16"
     initial_value="101"
     increment="1"
-    label="Avatar Maximum Complexity:"
+    label="Maximum avatar complexity"
+    text_color="White"
     label_width="165"
     layout="topleft"
     min_val="1"
@@ -82,6 +83,7 @@
     name="IndirectMaxComplexity"
     show_text="false"
     top_pad="10"
+    left="40"
     width="300">
   </slider>
   <text
@@ -92,7 +94,7 @@
     layout="topleft"
     top_delta="0"
     left_delta="304"
-    text_readonly_color="LabelDisabledColor"
+    text_color="White"
     name="IndirectMaxComplexityText"
     width="65">
     0
@@ -116,7 +118,7 @@
         <name_list.columns
          label=""
          name="complex_value"
-         width="40" />
+         width="50" />
         <name_list.columns
          label=""
          name="name"/>
@@ -131,7 +133,7 @@
    top_pad="10"
    name="av_nearby_desc2"
    width="580">
-     You can also right-click on an avatar to control display.
+     You can also right-click on an avatar in-world to control display.
   </text>
   <button
     height="23"
@@ -147,6 +149,7 @@
     height="16"
     initial_value="true"
     label="Always display friends"
+    label_text.text_color="White"
     layout="topleft"
     name="display_friends"
     top_pad="3"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index 81605b35a2..aaa27061e3 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -15,7 +15,7 @@
     mouse_opaque="true"
     follows="left|top"
     name="back_btn"
-    top="10"
+    top="7"
     image_selected="Arrow_Left_Off"
     image_pressed="Arrow_Left_Off"
     image_unselected="Arrow_Left_Off"
@@ -27,7 +27,7 @@
    height="20"
    layout="topleft"
    left_pad="3"
-   top="13"
+   top="10"
    name="back_lbl"
    width="40">
     Back
diff --git a/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml b/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml
index d942580880..0a14eeb1c0 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml
@@ -15,7 +15,7 @@
     mouse_opaque="true"
     follows="left|top"
     name="back_btn"
-    top="10"
+    top="7"
     image_selected="Arrow_Left_Off"
     image_pressed="Arrow_Left_Off"
     image_unselected="Arrow_Left_Off"
@@ -27,7 +27,7 @@
    height="20"
    layout="topleft"
    left_pad="3"
-   top="13"
+   top="10"
    name="back_lbl"
    width="40">
     Back