10 files changed, 1264 insertions, 0 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index efe8102f83..3816bf7e9a 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -963,4 +963,10 @@
   <color
     name="OutfitGalleryItemUnselected"
     value="0.4 0.4 0.4 1" />
+  <color
+    name="PerformanceFloaterGray"
+    value="0.27 0.27 0.27 1" />
+  <color
+    name="PerformanceMid"
+    value="1 0.8 0 1" />
 </colors>
diff --git a/indra/newview/skins/default/textures/icons/green_dot.png b/indra/newview/skins/default/textures/icons/green_dot.png
new file mode 100644
index 0000000000..02c07810c2
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/green_dot.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a875c4e848..51bb91cbf9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -234,6 +234,8 @@ with the same filename but different name
   <texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" />
   <texture name="Generic_Person_Large" file_name="icons/Generic_Person_Large.png" preload="false" />
 
+  <texture name="Green_dot" file_name="icons/green_dot.png" preload="false" />
+
   <texture name="Hand" file_name="icons/hand.png" preload="false" />
   
   <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
new file mode 100644
index 0000000000..42269ba34a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="550"
+ layout="topleft"
+ name="performance"
+ save_rect="true"
+ title="IMPROVE GRAPHICS SPEED"
+ width="580">
+  <panel
+   bevel_style="none"
+   follows="left|top"
+   height="490"
+   width="580"
+   name="panel_performance_main"
+   visible="true"
+   layout="topleft"
+   left="0"   
+   top="0">
+    <text
+     follows="left|top"
+     font="SansSerifHuge"
+     text_color="White"
+     height="20"
+     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"/>
+  </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"
+   layout="topleft"
+   top_pad="20">
+    <text
+     follows="left|top"
+     font="SansSerifLarge"
+     text_color="White"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="scripts_lbl"
+     top="12"
+     width="88">
+        Your avatar:
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerifLarge"
+     text_color="PerformanceMid"
+     height="20"
+     layout="topleft"
+     left_pad="2"
+     name="scripts_value"
+     width="100">
+        12 scripts
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     text_color="White"
+     height="20"
+     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
+     follows="left|top"
+     font="SansSerifLarge"
+     text_color="White"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="huds_lbl"
+     top="12"
+     width="80">
+        Your HUDs:
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerifLarge"
+     text_color="PerformanceMid"
+     height="20"
+     layout="topleft"
+     left_pad="3"
+     name="huds_value"
+     width="100">
+        7
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     text_color="White"
+     height="20"
+     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"/>
+  </panel>
+ </panel>
+  <panel
+    filename="panel_performance_troubleshooting.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_troubleshooting"
+    visible="false"
+    top="0" />
+  <panel
+    filename="panel_performance_nearby.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_nearby"
+    visible="false"
+    top="0" />
+  <panel
+    filename="panel_performance_scripts.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_scripts"
+    visible="false"
+    top="0" />
+  <panel
+    filename="panel_performance_preferences.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_preferences"
+    visible="false"
+    top="0" />
+  <panel
+    filename="panel_performance_huds.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_huds"
+    visible="false"
+    top="0" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0a50ff089f..f275b309a1 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -239,6 +239,13 @@
              function="Floater.Toggle"
              parameter="preferences" />
         </menu_item_call>
+        <menu_item_call
+          label="Performance..."
+          name="Performance">
+          <menu_item_call.on_click
+           function="Floater.Toggle"
+           parameter="performance" />
+        </menu_item_call>
          <menu_item_call
          label="Toolbar buttons..."
          name="Toolbars">
diff --git a/indra/newview/skins/default/xui/en/panel_performance_huds.xml b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
new file mode 100644
index 0000000000..c881fadbe8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_huds"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="10"
+    image_selected="Arrow_Left_Off"
+    image_pressed="Arrow_Left_Off"
+    image_unselected="Arrow_Left_Off"
+    left="15"
+    is_toggle="true">
+  </button>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   top="13"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="PerformanceMid"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="huds_title"
+   width="120">
+    HUDs displayed: 
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLargeBold"
+   text_color="PerformanceMid"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   name="huds_value"
+   width="70">
+    7
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   left="20"
+   name="huds_desc1"
+   width="540">
+    If there are any you don't need, detaching them may improve graphics speed.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   left="20"
+   name="huds_desc2"
+   width="540">
+    Note: Using a HUD's minimize button does not save memory. 
+  </text>
+  <name_list
+    column_padding="0"
+    draw_stripes="true"
+    height="220"
+    follows="left|top"
+    layout="topleft"
+    name="hud_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>
+  <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
new file mode 100644
index 0000000000..ade5f99451
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_nearby"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="10"
+    image_selected="Arrow_Left_Off"
+    image_pressed="Arrow_Left_Off"
+    image_unselected="Arrow_Left_Off"
+    left="15"
+    is_toggle="true">
+  </button>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   top="13"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="PerformanceMid"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="av_nearby_title"
+   width="215">
+    Avatars within draw distance:
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLargeBold"
+   text_color="PerformanceMid"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   name="av_nearby_value"
+   width="150">
+    42 (very high)
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="5"
+   name="av_nearby_desc"
+   width="580">
+    Some avatars nearby are slow to display. Choosing complexity limit may help graphics speed.
+  </text>
+  <slider
+    control_name="IndirectMaxComplexity"
+    tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
+    follows="left|top"
+    height="16"
+    initial_value="101"
+    increment="1"
+    label="Avatar Maximum Complexity:"
+    label_width="165"
+    layout="topleft"
+    min_val="1"
+    max_val="101"
+    name="IndirectMaxComplexity"
+    show_text="false"
+    top_pad="10"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateIndirectMaxComplexity"
+      parameter="IndirectMaxComlexityText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    text_readonly_color="LabelDisabledColor"
+    name="IndirectMaxComplexityText"
+    width="65">
+    0
+  </text>
+  <name_list
+    column_padding="0"
+    draw_stripes="true"
+    height="220"
+    left="20"
+    follows="left|top"
+    layout="topleft"
+    sort_column="complex_value"
+    name="nearby_list"
+    name_column="name"
+    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>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="av_nearby_desc2"
+   width="580">
+     You can also right-click on an avatar to control display.
+  </text>
+  <button
+    height="23"
+    label="Exceptions..."
+    layout="topleft"
+    left="460"
+    top_delta="2"
+    name="exceptions_btn"
+    width="100">
+  </button>
+  <check_box
+    control_name="AlwaysRenderFriends"
+    height="16"
+    initial_value="true"
+    label="Always display friends"
+    layout="topleft"
+    name="display_friends"
+    top_pad="3"
+    left="18"
+    width="256">
+  </check_box>
+
+ 
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
new file mode 100644
index 0000000000..81605b35a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_preferences"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="10"
+    image_selected="Arrow_Left_Off"
+    image_pressed="Arrow_Left_Off"
+    image_unselected="Arrow_Left_Off"
+    left="15"
+    is_toggle="true">
+  </button>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   top="13"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="PerformanceMid"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="preferences_title"
+   width="300">
+    This location is very complex
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="preferences_desc"
+   width="580">
+    While you are here, you may want to reduce graphics quality or draw distance.
+  </text>
+
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="35"
+   name="quality_lbl"
+   width="100">
+    Graphics quality
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left_pad="40"
+   name="fastest_lbl"
+   width="40">
+    Fastest
+  </text>
+  <slider
+    control_name="RenderQualityPerformance"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="0"
+    layout="topleft"
+    left_pad="5"
+    max_val="6"
+    name="graphics_quality"
+    show_text="false"
+    top_delta="-1"
+    width="275">
+  </slider>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left_pad="10"
+   top_delta="1"
+   name="quality_lbl"
+   width="70">
+    Best quality
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="40"
+   left="20"
+   name="enhancements_lbl"
+   width="100">
+    Enhancements
+  </text>
+  <check_box
+    control_name="WindLightUseAtmosShaders"
+    height="16"
+    initial_value="true"
+    label="Atmospheric shaders"
+    layout="topleft"
+    name="atmospheric_shaders"
+    left_pad="37"
+    width="280">
+  </check_box>
+  <check_box
+    control_name="RenderDeferred"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting Model"
+    layout="topleft"
+    name="advanced_lighting_model"
+    top_delta="24"
+    width="256">
+  </check_box>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="40"
+   left="20"
+   name="distance_lbl"
+   width="100">
+    Draw distance
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left_pad="40"
+   name="faster_lbl"
+   width="40">
+    Faster
+  </text>
+  <slider
+    control_name="RenderFarClip"
+    decimal_digits="0"
+    follows="left|top"
+    top_delta="-1"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label_width="90"
+    layout="topleft"
+    min_val="64"
+    max_val="512"
+    name="draw_distance"
+    left_pad="5"
+    width="250" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_pad="1"
+    top_delta="0"
+    name="draw_distance_m"
+    width="20">
+    m
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left_pad="10"
+   top_delta="1"
+   name="farther_lbl"
+   width="40">
+    Farther
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="20"
+   left="160"
+   name="distance_desc1"
+   width="100">
+    Regions are 256 m x 256 m.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   left="160"
+   name="distance_desc2"
+   width="400">
+    To zoom out and see long distances, increase the draw distance.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   left="160"
+   name="distance_desc3"
+   width="400">
+    If you are socializing in a small area, decrease the draw distance.
+  </text>
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset to recommended settings"
+    layout="topleft"
+    left="20"
+    name="defaults_btn"
+    top_delta="50"
+    width="210">
+  </button>
+  <button
+    follows="top|left"
+    height="23"
+    label="Advanced Settings..."
+    layout="topleft"
+    left_pad="10"
+    name="advanced_btn"
+    top_delta="0"
+    width="200"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_scripts.xml b/indra/newview/skins/default/xui/en/panel_performance_scripts.xml
new file mode 100644
index 0000000000..e6dc4a217d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_scripts.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_scripts"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="10"
+    image_selected="Arrow_Left_Off"
+    image_pressed="Arrow_Left_Off"
+    image_unselected="Arrow_Left_Off"
+    left="15"
+    is_toggle="true">
+  </button>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   top="13"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="PerformanceMid"
+   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
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   left="20"
+   name="attachments_desc1"
+   width="580">
+    These attachments contain scripts (embedded apps) that use memory.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   left="20"
+   name="attachments_desc2"
+   width="580">
+    If there are any you don't need, detaching them may improve graphics speed.
+  </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml b/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml
new file mode 100644
index 0000000000..d942580880
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_troubleshooting"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="10"
+    image_selected="Arrow_Left_Off"
+    image_pressed="Arrow_Left_Off"
+    image_unselected="Arrow_Left_Off"
+    left="15"
+    is_toggle="true">
+  </button>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="3"
+   top="13"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="PerformanceMid"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="troubleshooting_title"
+   width="300">
+    Fixes for common problems
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="troubleshooting_desc"
+   width="580">
+    Some problems result from the complexity of the location where you are. All you can do is leave.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   top_pad="30"
+   name="rubberbanding_title"
+   width="580">
+    Rubberbanding
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="rubberbanding_desc"
+   width="580">
+    When you walk, your avatar may be pulled backward again and again.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   name="rubberbanding_fix"
+   width="580">
+    Fix: XXXXXXX
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   top_pad="25"
+   name="tex_thrashing_title"
+   width="580">
+    Texture thrashing
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="tex_thrashing_desc"
+   width="580">
+    On objects near you, you may see their surfaces get blurry, then sharp, then blurry again.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   name="tex_thrashing_fix"
+   width="580">
+    Fix: XXXXXXX
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   top_pad="25"
+   name="av_moving_title"
+   width="580">
+    Avatars are not moving smoothly
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="av_moving_desc"
+   width="580">
+    Lorem ipsum dolor sit amet.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   name="av_moving_fix"
+   width="580">
+    Fix: XXXXXXX
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   top_pad="25"
+   name="av_moving_title"
+   width="580">
+    Will a better graphics card or new computer help?
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="av_moving_desc"
+   width="580">
+    Lorem ipsum dolor sit amet.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   name="av_moving_fix"
+   width="580">
+    Fix: XXXXXXX
+  </text>
+</panel>