From 10a770047d90045e882a65e5347da3530b189c42 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 11 Jun 2021 19:10:43 +0300
Subject: SL-15297 WIP Implement performance floater

---
 indra/newview/skins/default/colors.xml             |   6 +
 .../skins/default/textures/icons/green_dot.png     | Bin 0 -> 18614 bytes
 indra/newview/skins/default/textures/textures.xml  |   2 +
 .../skins/default/xui/en/floater_performance.xml   | 447 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 +
 .../default/xui/en/panel_performance_huds.xml      | 112 ++++++
 .../default/xui/en/panel_performance_nearby.xml    | 161 ++++++++
 .../xui/en/panel_performance_preferences.xml       | 257 ++++++++++++
 .../default/xui/en/panel_performance_scripts.xml   |  82 ++++
 .../xui/en/panel_performance_troubleshooting.xml   | 190 +++++++++
 10 files changed, 1264 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/icons/green_dot.png
 create mode 100644 indra/newview/skins/default/xui/en/floater_performance.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_huds.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_nearby.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_preferences.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_scripts.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml

(limited to 'indra/newview/skins/default')

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
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/green_dot.png differ
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
@@ -238,6 +238,13 @@
             <menu_item_call.on_click
              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..."
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>
-- 
cgit v1.2.3


From 0914f5c48f777705bdc57188e7372707f7977e5a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 15 Jun 2021 19:25:08 +0300
Subject: SL-15297 WIP Implement performance floater #2

---
 indra/newview/skins/default/xui/en/panel_performance_nearby.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default')

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 ade5f99451..d71b5334cd 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -83,9 +83,6 @@
     show_text="false"
     top_pad="10"
     width="300">
-    <slider.commit_callback
-      function="Pref.UpdateIndirectMaxComplexity"
-      parameter="IndirectMaxComlexityText" />
   </slider>
   <text
     type="string"
-- 
cgit v1.2.3


From bc609f964b13141301aca9d29b9ceb5f9a541bf9 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 17 Jun 2021 20:37:06 +0300
Subject: SL-15297 WIP Implement performance floater - updated UI

---
 .../skins/default/textures/icons/green_dot.png     | Bin 18614 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml  |   2 -
 .../skins/default/xui/en/floater_performance.xml   | 730 ++++++++++-----------
 .../xui/en/panel_performance_complexity.xml        |  92 +++
 .../default/xui/en/panel_performance_huds.xml      |  20 +-
 .../default/xui/en/panel_performance_nearby.xml    |  25 +-
 .../xui/en/panel_performance_preferences.xml       |   4 +-
 .../default/xui/en/panel_performance_scripts.xml   |  82 ---
 .../xui/en/panel_performance_troubleshooting.xml   |   4 +-
 9 files changed, 470 insertions(+), 489 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/green_dot.png
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_complexity.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_performance_scripts.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/icons/green_dot.png b/indra/newview/skins/default/textures/icons/green_dot.png
deleted file mode 100644
index 02c07810c2..0000000000
Binary files a/indra/newview/skins/default/textures/icons/green_dot.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 51bb91cbf9..a875c4e848 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -234,8 +234,6 @@ 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
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_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
new file mode 100644
index 0000000000..8d4512c4f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_complexity"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="7"
+    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="10"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="white"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="attachments_title"
+   width="195">
+    My avatar complexity 
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   left="20"
+   name="attachments_desc1"
+   width="580">
+    Complex attachments require more time and memory to display.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   left="20"
+   name="attachments_desc2"
+   width="580">
+    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_scripts.xml b/indra/newview/skins/default/xui/en/panel_performance_scripts.xml
deleted file mode 100644
index e6dc4a217d..0000000000
--- a/indra/newview/skins/default/xui/en/panel_performance_scripts.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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
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
-- 
cgit v1.2.3


From 3fe7715197c1e9a4ae781201df7a9ec24354f15e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 18 Jun 2021 18:36:15 +0300
Subject: SL-15297 WIP Implement performance floater - Quick and Individual
 settings panels

---
 .../skins/default/xui/en/floater_performance.xml   |  10 +-
 .../default/xui/en/panel_performance_nearby.xml    |   2 +-
 .../xui/en/panel_performance_preferences.xml       | 255 ++++++++++++++++-----
 .../default/xui/en/panel_performance_presets.xml   | 223 ++++++++++++++++++
 4 files changed, 425 insertions(+), 65 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_presets.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 09af364266..e415ac5be0 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -194,7 +194,7 @@
        text_color="PerformanceMid"
        height="20"
        layout="topleft"
-       left_pad="5"
+       left_pad="2"
        name="avatars_nearby_value"
        width="100">
           very high
@@ -382,6 +382,14 @@
        right="-20"/>
     </panel>
   </panel>
+  <panel
+    filename="panel_performance_presets.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_presets"
+    visible="false"
+    top="55" />
   <panel
     filename="panel_performance_troubleshooting.xml"
     follows="all"
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 28ffbd5c2e..9d91e86b7a 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -46,7 +46,7 @@
   </text>
   <text
    follows="left|top"
-   font="SansSerifLargeBold"
+   font="SansSerifLarge"
    text_color="PerformanceMid"
    height="20"
    layout="topleft"
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 aaa27061e3..ec1b624f13 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="490"
+ height="510"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -35,37 +35,33 @@
   <text
    follows="left|top"
    font="SansSerifLarge"
-   text_color="PerformanceMid"
+   text_color="white"
    height="20"
    layout="topleft"
    left="20"
    top_pad="10"
-   name="preferences_title"
+   name="settings_title"
    width="300">
-    This location is very complex
+    Individual settings
   </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border1"
+    top_pad="8"
+    width="540"/>
   <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"
+   top_pad="20"
    name="quality_lbl"
    width="100">
     Graphics quality
+shortcuts
   </text>
   <text
    follows="left|top"
@@ -111,43 +107,31 @@
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="40"
-   left="20"
-   name="enhancements_lbl"
-   width="100">
-    Enhancements
+   top_pad="15"
+   left="160"
+   name="quality_desc"
+   width="380">
+    Choosing a shortcut will reset all manual changes you have made.
   </text>
-  <check_box
-    control_name="WindLightUseAtmosShaders"
-    height="16"
-    initial_value="true"
-    label="Atmospheric shaders"
+  <view_border
+    bevel_style="in"
+    height="0"
     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>
+    name="border2"
+    top_pad="15"
+    left="20"
+    width="540"/>
   <text
    follows="left|top"
    font="SansSerifSmall"
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="40"
+   top_pad="20"
    left="20"
    name="distance_lbl"
    width="100">
-    Draw distance
+    Visibility distance
   </text>
   <text
    follows="left|top"
@@ -205,11 +189,11 @@
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="20"
+   top_pad="15"
    left="160"
    name="distance_desc1"
-   width="100">
-    Regions are 256 m x 256 m.
+   width="350">
+    To zoom out and see long distances, increase the distance.
   </text>
   <text
    follows="left|top"
@@ -220,38 +204,183 @@
    top_pad="5"
    left="160"
    name="distance_desc2"
-   width="400">
-    To zoom out and see long distances, increase the draw distance.
+   width="350">
+    If you are indoors, decrease the distance to improve speed.
   </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border3"
+    top_pad="15"
+    left="20"
+    width="540"/>
   <text
    follows="left|top"
    font="SansSerifSmall"
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="5"
+   top_pad="20"
+   left="20"
+   name="enhancements_lbl"
+   width="100">
+    Enhancements
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_delta="0"
    left="160"
-   name="distance_desc3"
-   width="400">
-    If you are socializing in a small area, decrease the draw distance.
+   name="enhancements_desc"
+   width="350">
+    Each enhancement improves realism but can reduce speed.
   </text>
-  <button
-    follows="top|left"
-    height="23"
-    label="Reset to recommended settings"
+  <check_box
+    control_name="WindLightUseAtmosShaders"
+    height="16"
+    initial_value="true"
+    label="Atmospheric shaders"
+    layout="topleft"
+    name="atmospheric_shaders"
+    top_pad="5"
+    left="157"
+    width="280">
+  </check_box>
+  <check_box
+    control_name="RenderDeferred"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting"
+    layout="topleft"
+    name="advanced_lighting_model"
+    top_delta="24"
+    width="280">
+  </check_box>
+  <check_box
+    control_name="RenderTransparentWater"
+    height="16"
+    initial_value="true"
+    label="Transparent Water"
+    layout="topleft"
+    name="TransparentWater"
+    top_delta="24"
+    width="280">
+  </check_box>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ReflectionsText"
+    text_readonly_color="LabelDisabledColor"
+    top_pad="16"
+    left="160"
+    width="128">
+    Water Reflections:
+  </text>
+  <combo_box
+    control_name="RenderReflectionDetail"
+    height="18"
+    layout="topleft"
+    left_delta="150"
+    top_delta="0"
+    name="Reflections"
+    width="150">
+    <combo_box.item
+      label="None; opaque"
+      name="0"
+      value="-2"/>
+    <combo_box.item
+      label="None; transparent"
+      name="0"
+      value="-1"/>
+    <combo_box.item
+      label="Minimal"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Terrain and trees"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="All static objects"
+      name="2"
+      value="2"/>
+    <combo_box.item
+      label="All avatars and objects"
+      name="3"
+      value="3"/>
+    <combo_box.item
+      label="Everything"
+      name="4"
+      value="4"/>
+  </combo_box>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
     layout="topleft"
+    left="160"
+    name="RenderShadowDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_pad="10"
+    width="128">
+    Shadows:
+  </text>
+  <combo_box
+   control_name="RenderShadowDetail"
+   height="18"
+   layout="topleft"
+   left_delta="150"
+   top_delta="0"
+   name="ShadowDetail"
+   width="150">
+    <combo_box.item
+      label="None"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Sun/Moon"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="Sun/Moon + Projectors"
+      name="2"
+      value="2"/>
+  </combo_box>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   top_pad="8"
+   left="160"
+   skip_link_underline="true"
+   name="settings_help"
+   width="350">
+    [secondlife:/// What do these settings mean?]
+  </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border3"
+    top_pad="10"
     left="20"
-    name="defaults_btn"
-    top_delta="50"
-    width="210">
-  </button>
+    width="540"/>
   <button
     follows="top|left"
     height="23"
-    label="Advanced Settings..."
+    label="Open Advanced Settings"
     layout="topleft"
-    left_pad="10"
+    left="160"
     name="advanced_btn"
-    top_delta="0"
+    top_pad="12"
     width="200"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_presets.xml b/indra/newview/skins/default/xui/en/panel_performance_presets.xml
new file mode 100644
index 0000000000..51516020a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_presets.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="490"
+ width="580"
+ name="panel_performance_presets"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="7"
+    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="10"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="presets_title"
+   width="300">
+    Quick settings
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="presets_desc"
+   width="580">
+    Note: Quick settings will reset all manual changes you have made.
+  </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="top_border"
+    top_pad="12"
+    width="540"/>
+  <button
+    follows="top|left"
+    height="23"
+    label="Social"
+    label_color="White"
+    layout="topleft"
+    name="social"
+    top_pad="14"
+    width="130">
+  </button>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="14"
+   name="social_desc1"
+   width="580">
+    Tuned for many avatars in a room.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="5"
+   name="social_desc2"
+   width="180">
+    Nearby avatar complexity is high.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="5"
+   name="avatars_nearby_link"
+   skip_link_underline="true"
+   width="200">
+    [secondlife:/// Choose avatars to show and hide]
+  </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="social_border"
+    left="20"
+    top_pad="12"
+    width="540"/>
+  <button
+    follows="top|left"
+    height="23"
+    label="Outdoors"
+    label_color="White"
+    layout="topleft"
+    name="outdoors"
+    top_pad="14"
+    width="130">
+  </button>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="14"
+   name="outdoors_desc"
+   width="580">
+    Fewer avatars, higher visibility distance.
+  </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="outdoors_border"
+    top_pad="12"
+    width="540"/>
+  <button
+    follows="top|left"
+    height="23"
+    label="Maximum distance"
+    label_color="White"
+    layout="topleft"
+    name="max_distance"
+    top_pad="14"
+    width="130">
+  </button>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="14"
+   name="max_distance_desc"
+   width="580">
+    Good for zooming your camera far out and viewing large land areas.
+  </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="max_distance_border"
+    top_pad="12"
+    width="540"/>
+  <button
+    follows="top|left"
+    height="23"
+    label="Photography"
+    label_color="White"
+    layout="topleft"
+    name="photography"
+    top_pad="14"
+    width="130">
+  </button>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="14"
+   name="photography_desc"
+   width="580">
+    Maximum quality, minimum visibility distance.
+  </text>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="photography_border"
+    top_pad="12"
+    width="540"/>
+    <text
+     follows="left|top"
+     font="SansSerifSmall"
+     text_color="White"
+     height="18"
+     layout="topleft"
+     top_pad="14"
+     name="settings_desc"
+     width="110">
+    For more control, try
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="3"
+   name="settings_link"
+   skip_link_underline="true"
+   width="200">
+    [secondlife:/// Idividual Settings]
+  </text>
+
+</panel>
-- 
cgit v1.2.3


From f33605f8b113f1fed84564c7618630acd5c9427a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 24 Jun 2021 16:17:04 +0300
Subject: SL-15297 WIP Implement performance floater - implement complexity
 bars

---
 indra/newview/skins/default/xui/en/floater_performance.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index e415ac5be0..4cd3c7a603 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -12,6 +12,9 @@
   <string
      name="medium"
      value="medium"/>
+  <string
+    name="low"
+    value="low"/>
   <panel
    bevel_style="none"
    follows="left|top"
-- 
cgit v1.2.3


From 74c6580e5c3507ef72590a3543e2b0b2ee9c13a3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 25 Jun 2021 20:05:07 +0300
Subject: SL-15297 WIP restore selection after updating the list & don't show
 avatars in the list as disabled when complexity is not limited

---
 indra/newview/skins/default/colors.xml                       |  5 +----
 .../skins/default/xui/en/floater_add_payment_method.xml      |  2 +-
 indra/newview/skins/default/xui/en/floater_performance.xml   | 12 ++++++------
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 9fcb6edca4..e8d3c12d39 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -967,10 +967,7 @@
     name="OutfitGalleryItemUnselected"
     value="0.4 0.4 0.4 1" />
   <color
-    name="AddPaymentPanel"
-    value="0.27 0.27 0.27 1" />
-  <color
-    name="PerformanceFloaterGray"
+    name="PanelGray"
     value="0.27 0.27 0.27 1" />
   <color
     name="PerformanceMid"
diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
index 1f980564d4..ac88263aa1 100644
--- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
@@ -19,7 +19,7 @@
   </floater.string>
   <panel
    background_opaque="false"
-   bg_alpha_color="AddPaymentPanel"
+   bg_alpha_color="PanelGray"
    border_visible="false"
    background_visible="true"
    label="wrapper_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 4cd3c7a603..039421d589 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -75,7 +75,7 @@
    left="0"   
    top="60">
     <panel
-     bg_alpha_color="PerformanceFloaterGray"
+     bg_alpha_color="PanelGray"
      background_visible="true"
      background_opaque="false"
      border="true"
@@ -122,7 +122,7 @@
        right="-20"/>
     </panel>
     <panel
-     bg_alpha_color="PerformanceFloaterGray"
+     bg_alpha_color="PanelGray"
      background_visible="true"
      background_opaque="false"
      border="true"
@@ -168,7 +168,7 @@
          right="-20"/>
       </panel>
     <panel
-     bg_alpha_color="PerformanceFloaterGray"
+     bg_alpha_color="PanelGray"
      background_visible="true"
      background_opaque="false"
      border="true"
@@ -225,7 +225,7 @@
        right="-20"/>
     </panel>
     <panel
-     bg_alpha_color="PerformanceFloaterGray"
+     bg_alpha_color="PanelGray"
      background_visible="true"
      background_opaque="false"
      border="true"
@@ -282,7 +282,7 @@
        right="-20"/>
     </panel>
     <panel
-     bg_alpha_color="PerformanceFloaterGray"
+     bg_alpha_color="PanelGray"
      background_visible="true"
      background_opaque="false"
      border="true"
@@ -339,7 +339,7 @@
        right="-20"/>
     </panel>
     <panel
-     bg_alpha_color="PerformanceFloaterGray"
+     bg_alpha_color="PanelGray"
      background_visible="true"
      background_opaque="false"
      border="true"
-- 
cgit v1.2.3


From 54ffa6a23d093af8932f8978d3c1a420153f7997 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 29 Jun 2021 18:34:18 +0300
Subject: SL-15297 WIP update Individual settings panel & correctly show avatar
 state in the list

---
 .../xui/en/panel_performance_preferences.xml       | 144 ++++++++++++++++++---
 1 file changed, 127 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default')

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 ec1b624f13..b5cc2a29ed 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="510"
+ height="520"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -57,7 +57,7 @@
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="20"
+   top_pad="30"
    name="quality_lbl"
    width="100">
     Graphics quality
@@ -74,21 +74,60 @@ shortcuts
    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>
+  <radio_group
+   control_name="RenderQualityPerformance"
+   follows="top|left"
+   draw_border="false"
+   height="25"
+   layout="topleft"
+   left_pad="5"
+   name="graphics_quality"
+   top_delta="0"
+   width="243">
+    <radio_item
+     height="16"
+     layout="topleft"
+     left="3"
+     name="0"
+     top="0"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="1"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="2"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="3"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="4"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="5"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="6"
+     width="7" />
+  </radio_group>
   <text
    follows="left|top"
    font="SansSerifSmall"
@@ -383,4 +422,75 @@ shortcuts
     name="advanced_btn"
     top_pad="12"
     width="200"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   top="78"
+   left="213"
+   name="1_lbl"
+   width="7">
+    1
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="31"
+   name="2_lbl"
+   width="7">
+    2
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="3_lbl"
+   width="7">
+    3
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="4_lbl"
+   width="7">
+    4
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="5_lbl"
+   width="7">
+    5
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="6_lbl"
+   width="7">
+      6
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="7_lbl"
+   width="7">
+    7
+  </text>
 </panel>
-- 
cgit v1.2.3


From 77aac9579170369a11f0884e16bd730f8cbb8bdb Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 14 Jul 2021 14:49:43 +0300
Subject: SL-15297 performance floater ui update

---
 .../xui/en/floater_avatar_render_settings.xml      |  66 +++---
 .../skins/default/xui/en/floater_performance.xml   | 217 ++++----------------
 .../xui/en/menu_avatar_rendering_settings.xml      |  25 +--
 .../xui/en/menu_avatar_rendering_settings_add.xml  |   4 +-
 .../xui/en/panel_performance_complexity.xml        |   6 +-
 .../default/xui/en/panel_performance_huds.xml      |  17 +-
 .../default/xui/en/panel_performance_nearby.xml    |  18 +-
 .../xui/en/panel_performance_preferences.xml       | 186 +++++++++++------
 .../default/xui/en/panel_performance_presets.xml   | 223 ---------------------
 .../xui/en/panel_performance_troubleshooting.xml   | 190 ------------------
 10 files changed, 227 insertions(+), 725 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_performance_presets.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
index e088d4d2a1..d222dca98b 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
@@ -10,7 +10,7 @@
  save_rect="true"
  single_instance="true"
  reuse_instance="true"
- title="AVATAR RENDER SETTINGS"
+ title="AVATAR DISPLAY EXCEPTIONS"
  width="300">
     <string
      name="av_never_render"
@@ -18,53 +18,45 @@
     <string
      name="av_always_render"
      value="Always"/>
-    <filter_editor
-     follows="left|top|right"
-     height="23"
-     layout="topleft"
-     left="8"
-     right="-47"
-     label="Filter People"
-     max_length_chars="300"
-     name="people_filter_input"
-     text_color="Black"
-     text_pad_left="10"
-     top="4" />
-    <menu_button
-     follows="top|right"
-     height="25"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_overlay="AddItem_Off"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="7"
-     menu_filename="menu_avatar_rendering_settings_add.xml"
-     menu_position="bottomleft"
-     name="plus_btn"
-     tool_tip="Actions on selected person"
-     top="3"
-     width="31" />
     <name_list
-     bottom="-8"
+     bottom="-33"
      draw_heading="true"
      follows="all"
      left="8"
      multi_select="false"
      name="render_settings_list"
      right="-8"
-     top="32">
+     top="0">
         <name_list.columns
          label="Name"
          name="name"
-         relative_width="0.5" />
+         relative_width="0.65" />
         <name_list.columns
-         label="Render setting"
+         label="Full detail"
          name="setting"
-         relative_width="0.25" />
-        <name_list.columns
-         label="Date added"
-         name="timestamp"
-         relative_width="0.25" />
+         relative_width="0.35" />
      </name_list>
+    <panel
+     bg_alpha_color="ScrollBgWriteableColor"
+     background_visible="true"
+     background_opaque="false"
+     bevel_style="none"
+     follows="bottom|left|right"
+     name="add_subpanel"
+     layout="topleft"
+     height="28"
+     top_pad="0">
+     <menu_button
+       follows="bottom|left"
+       height="25"
+       label="Add someone..."
+       layout="topleft"
+       menu_filename="menu_avatar_rendering_settings_add.xml"
+       menu_position="bottomleft"
+       name="plus_btn"
+       tool_tip="Actions on selected person"
+       top="1"
+       left="8"
+       width="120" />
+     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 039421d589..210b2f8792 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="590"
+ height="692"
  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"/>
-  <string
-    name="low"
-    value="low"/>
   <panel
    bevel_style="none"
    follows="left|top"
@@ -57,70 +48,44 @@
        height="20"
        layout="topleft"
        left_pad="0"
-       top="14"
+       top="13"
        name="fps_lbl"
        width="450">
-          FPS -- 60 or more for the best experience
-      </text>    
-    </panel>
-  </panel>
-  <panel
-   bevel_style="none"
-   follows="left|top"
-   height="540"
-   width="580"
-   name="panel_performance_main"
-   visible="true"
-   layout="topleft"
-   left="0"   
-   top="60">
-    <panel
-     bg_alpha_color="PanelGray"
-     background_visible="true"
-     background_opaque="false"
-     border="true"
-     bevel_style="none"
-     follows="left|top"
-     height="60"
-     width="560"
-     name="presets_subpanel"
-     layout="topleft"
-     left="10"
-     top="5">
+          frames per second
+      </text>
       <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
+       left="395"
+       top="7"
+       name="fps_desc1_lbl"
+       width="150">
+        Allow 5-10 seconds for
       </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.
+       top_pad="-3"
+       name="fps_desc2_lbl"
+       width="150">
+        changes to take full effect.
       </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
+   bevel_style="none"
+   follows="left|top"
+   height="540"
+   width="580"
+   name="panel_performance_main"
+   visible="true"
+   layout="topleft"
+   left="0"   
+   top="60">    
     <panel
      bg_alpha_color="PanelGray"
      background_visible="true"
@@ -128,11 +93,12 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="60"
+     height="70"
      width="560"
      name="settings_subpanel"
      layout="topleft"
-     top_pad="20">
+     left="10"
+     top="5">
         <text
          follows="left|top"
          font="SansSerifLarge"
@@ -143,7 +109,7 @@
          name="settings_lbl"
          top="12"
          width="180">
-          Individual settings
+          Graphics settings
         </text>
         <text
          follows="left|top"
@@ -153,9 +119,9 @@
          layout="topleft"
          left="10"
          name="settings_desc"
-         top_pad="5"
+         top_pad="10"
          width="395">
-          More control over quality, visibility distance, and enhancements.
+          Choose settings for distance, water, lighting and more.
         </text>
         <icon
          height="16"
@@ -164,7 +130,7 @@
          mouse_opaque="true"
          name="icon_arrow3"
          follows="right|top"
-         top="24"
+         top="29"
          right="-20"/>
       </panel>
     <panel
@@ -174,7 +140,7 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="60"
+     height="70"
      width="560"
      name="nearby_subpanel"
      layout="topleft"
@@ -189,18 +155,7 @@
        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="2"
-       name="avatars_nearby_value"
-       width="100">
-          very high
+          Avatars nearby
       </text>
       <text
        follows="left|top"
@@ -210,9 +165,9 @@
        layout="topleft"
        left="10"
        name="avatars_nearby_desc"
-       top_pad="5"
+       top_pad="10"
        width="395">
-          Choose which avatars are not displayed in detail, to increase FPS.
+          Manage which nearby avatars are fully displayed.
       </text>
       <icon
        height="16"
@@ -221,7 +176,7 @@
        mouse_opaque="true"
        name="icon_arrow2"
        follows="right|top"
-       top="24"
+       top="29"
        right="-20"/>
     </panel>
     <panel
@@ -231,7 +186,7 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="60"
+     height="70"
      width="560"
      name="complexity_subpanel"
      layout="topleft"
@@ -246,18 +201,7 @@
        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
+          Your avatar complexity
       </text>
       <text
        follows="left|top"
@@ -267,7 +211,7 @@
        layout="topleft"
        left="10"
        name="complexity_info"
-       top_pad="5"
+       top_pad="10"
        width="455">
           Reduce the complexity of your avatar if you aren't satisfied with current FPS.
       </text>
@@ -278,7 +222,7 @@
        mouse_opaque="true"
        name="icon_arrow4"
        follows="right|top"
-       top="24"
+       top="29"
        right="-20"/>
     </panel>
     <panel
@@ -288,7 +232,7 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="60"
+     height="70"
      width="560"
      name="huds_subpanel"
      layout="topleft"
@@ -303,18 +247,7 @@
        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
+          Your active HUDs
       </text>
       <text
        follows="left|top"
@@ -324,7 +257,7 @@
        layout="topleft"
        left="10"
        name="huds_desc"
-       top_pad="5"
+       top_pad="10"
        width="395">
           Removing HUDs you are not using can improve speed.
       </text>
@@ -335,72 +268,10 @@
        mouse_opaque="true"
        name="icon_arrow4"
        follows="right|top"
-       top="24"
-       right="-20"/>
-    </panel>
-    <panel
-     bg_alpha_color="PanelGray"
-     background_visible="true"
-     background_opaque="false"
-     border="true"
-     bevel_style="none"
-     follows="left|top"
-     height="60"
-     width="560"
-     name="troubleshooting_subpanel"
-     layout="topleft"
-     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"
+       top="29"
        right="-20"/>
     </panel>
   </panel>
-  <panel
-    filename="panel_performance_presets.xml"
-    follows="all"
-    layout="topleft"
-    left="0"
-    name="panel_performance_presets"
-    visible="false"
-    top="55" />
-  <panel
-    filename="panel_performance_troubleshooting.xml"
-    follows="all"
-    layout="topleft"
-    left="0"
-    name="panel_performance_troubleshooting"
-    visible="false"
-    top="55" />
   <panel
     filename="panel_performance_nearby.xml"
     follows="all"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml
index 5163cd3115..1a18483418 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml
@@ -3,24 +3,25 @@
  layout="topleft"
  name="Settings">
     <menu_item_check
-     label="Default"
-     layout="topleft"
-     name="default">
-        <on_click function="Settings.SetRendering" parameter="default"/>
-	<on_check function="Settings.IsSelected" parameter="default" />  
-    </menu_item_check>
-    <menu_item_check
-     label="Always render"
+     label="Always full detail"
      layout="topleft"
      name="always_render">
         <on_click function="Settings.SetRendering" parameter="always"/>
-	<on_check function="Settings.IsSelected" parameter="always" />  
+        <on_check function="Settings.IsSelected" parameter="always" />  
     </menu_item_check>
     <menu_item_check
-     label="Never render"
+     label="Never full detail"
      layout="topleft"
      name="never_render">
         <on_click function="Settings.SetRendering" parameter="never"/>
-	<on_check function="Settings.IsSelected" parameter="never" />  
-    </menu_item_check>  
+        <on_check function="Settings.IsSelected" parameter="never" />
+    </menu_item_check>
+    <menu_item_check
+     label="Remove from exceptions"
+     layout="topleft"
+     name="default">
+        <on_click function="Settings.SetRendering" parameter="default"/>
+        <on_check function="Settings.IsSelected" parameter="default" />
+        <on_visible function="Settings.IsSelected" parameter="non_default" />
+  </menu_item_check>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
index c64b24ed70..6e09eb5981 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
@@ -4,13 +4,13 @@
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
   <menu_item_call
-   label="Always Render a Resident..."
+   label="Always full detail..."
    name="add_avatar_always_render">
       <on_click
        function="Settings.AddNewEntry" parameter="always"/>
   </menu_item_call>
   <menu_item_call
-   label="Never Render a Resident..."
+   label="Never full detail..."
    name="add_avatar_never_render">
       <on_click
        function="Settings.AddNewEntry"  parameter="never"/>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index 8d4512c4f7..b2f65f9488 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -42,7 +42,7 @@
    top_pad="10"
    name="attachments_title"
    width="195">
-    My avatar complexity 
+    Your avatar complexity 
   </text>
   <text
    follows="left|top"
@@ -54,7 +54,7 @@
    left="20"
    name="attachments_desc1"
    width="580">
-    Complex attachments require more time and memory to display.
+    If your avatar is very complex, some other people may not see you in full detail and
   </text>
   <text
    follows="left|top"
@@ -66,7 +66,7 @@
    left="20"
    name="attachments_desc2"
    width="580">
-    While you are in this location, removing the most complex ones may increase speed.
+    your own graphics speed may be reduced.
   </text>
   <name_list
     column_padding="0"
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 96bdf2412f..7dcadc557b 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -42,18 +42,7 @@
    top_pad="10"
    name="huds_title"
    width="135">
-    Your current HUDs: 
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifLargeBold"
-   text_color="PerformanceMid"
-   height="20"
-   layout="topleft"
-   left_pad="3"
-   name="huds_value"
-   width="70">
-    7
+    Your active HUDs
   </text>
   <text
    follows="left|top"
@@ -65,7 +54,7 @@
    left="20"
    name="huds_desc1"
    width="540">
-    Detaching HUDs you aren't using us always a good idea, but especially in a complex location.
+    Detaching HUDs you aren't using saves memory and can make Second Life run faster.
   </text>
   <text
    follows="left|top"
@@ -77,7 +66,7 @@
    left="20"
    name="huds_desc2"
    width="540">
-    Note: Using a HUD's minimize button does not save memory. 
+    Note: Using a HUD's minimize button does not detach it. 
   </text>
   <name_list
     column_padding="0"
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 9d91e86b7a..4cc7ffda40 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -42,18 +42,7 @@
    top_pad="10"
    name="av_nearby_title"
    width="205">
-    Nearby avatar complexity is
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifLarge"
-   text_color="PerformanceMid"
-   height="20"
-   layout="topleft"
-   left_pad="3"
-   name="av_nearby_value"
-   width="150">
-    very high
+    Avatars nearby
   </text>
   <text
    follows="left|top"
@@ -65,7 +54,7 @@
    top_pad="5"
    name="av_nearby_desc"
    width="580">
-    Some avatars nearby are slow to display. Choosing a complexity limit may help graphics speed.
+    Avatars more complex than your chosen limit will be shown in silhouette.
   </text>
   <slider
     control_name="IndirectMaxComplexity"
@@ -83,7 +72,6 @@
     name="IndirectMaxComplexity"
     show_text="false"
     top_pad="10"
-    left="40"
     width="300">
   </slider>
   <text
@@ -148,7 +136,7 @@
     control_name="AlwaysRenderFriends"
     height="16"
     initial_value="true"
-    label="Always display friends"
+    label="Always display friends in full detail"
     label_text.text_color="White"
     layout="topleft"
     name="display_friends"
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 b5cc2a29ed..fb62e7beb3 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="520"
+ height="630"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -42,7 +42,7 @@
    top_pad="10"
    name="settings_title"
    width="300">
-    Individual settings
+    Graphics settings
   </text>
   <view_border
     bevel_style="in"
@@ -60,8 +60,7 @@
    top_pad="30"
    name="quality_lbl"
    width="100">
-    Graphics quality
-shortcuts
+    Shortcuts
   </text>
   <text
    follows="left|top"
@@ -232,19 +231,7 @@ shortcuts
    left="160"
    name="distance_desc1"
    width="350">
-    To zoom out and see long distances, increase the distance.
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="5"
-   left="160"
-   name="distance_desc2"
-   width="350">
-    If you are indoors, decrease the distance to improve speed.
+    To see more land when you zoom out, increase the distance.
   </text>
   <view_border
     bevel_style="in"
@@ -262,9 +249,9 @@ shortcuts
    layout="topleft"
    top_pad="20"
    left="20"
-   name="enhancements_lbl"
+   name="environment_lbl"
    width="100">
-    Enhancements
+    Environment
   </text>
   <text
    follows="left|top"
@@ -298,7 +285,73 @@ shortcuts
     name="advanced_lighting_model"
     top_delta="24"
     width="280">
-  </check_box>
+  </check_box>  
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="160"
+    name="RenderShadowDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_pad="10"
+    width="128">
+    Shadows:
+  </text>
+  <combo_box
+   control_name="RenderShadowDetail"
+   height="18"
+   layout="topleft"
+   left_delta="150"
+   top_delta="0"
+   name="ShadowDetail"
+   width="150">
+    <combo_box.item
+      label="None"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Sun/Moon"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="Sun/Moon + Projectors"
+      name="2"
+      value="2"/>
+  </combo_box>
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border3"
+    top_pad="15"
+    left="20"
+    width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="20"
+   left="20"
+   name="water_lbl"
+   width="100">
+    Water
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_delta="0"
+   left="160"
+   name="water_desc"
+   width="350">
+    Reducing or turning off water effects can greatly improve frame rate.
+  </text>
   <check_box
     control_name="RenderTransparentWater"
     height="16"
@@ -307,6 +360,7 @@ shortcuts
     layout="topleft"
     name="TransparentWater"
     top_delta="24"
+    left="157"
     width="280">
   </check_box>
   <text
@@ -359,57 +413,77 @@ shortcuts
       name="4"
       value="4"/>
   </combo_box>
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
+  <view_border
+    bevel_style="in"
+    height="0"
     layout="topleft"
-    left="160"
-    name="RenderShadowDetailText"
-    text_readonly_color="LabelDisabledColor"
-    top_pad="10"
-    width="128">
-    Shadows:
-  </text>
-  <combo_box
-   control_name="RenderShadowDetail"
+    name="border4"
+    top_pad="15"
+    left="20"
+    width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
    height="18"
    layout="topleft"
-   left_delta="150"
-   top_delta="0"
-   name="ShadowDetail"
-   width="150">
-    <combo_box.item
-      label="None"
-      name="0"
-      value="0"/>
-    <combo_box.item
-      label="Sun/Moon"
-      name="1"
-      value="1"/>
-    <combo_box.item
-      label="Sun/Moon + Projectors"
-      name="2"
-      value="2"/>
-  </combo_box>
+   top_pad="20"
+   left="20"
+   name="photo_lbl"
+   width="100">
+    Photography
+  </text>
   <text
    follows="left|top"
    font="SansSerifSmall"
+   text_color="White"
    height="18"
    layout="topleft"
-   top_pad="8"
+   top_delta="0"
    left="160"
-   skip_link_underline="true"
-   name="settings_help"
+   name="photo_desc"
    width="350">
-    [secondlife:/// What do these settings mean?]
+    Maximum detail is good for photos, but can slow frame rate.
+  </text>
+  <spinner
+   control_name="RenderVolumeLODFactor"
+   follows="left|top"
+   height="23"
+   increment="0.125"
+   label="Distance detail:"
+   label_width="95"
+   layout="topleft"
+   max_val="4"
+   min_val="0"
+   name="render_volume_lod"
+   top_pad="10"
+   width="150" />
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   top_delta="3"
+   left_pad="10"
+   name="photo_desc"
+   width="180">
+      (Enter value between 0.0 and 4.0)
   </text>
+  <check_box
+    height="16"
+    initial_value="true"
+    label="Hide avatars completely (good for landscape photos)"
+    layout="topleft"
+    name="hide_avatars"
+    top_delta="29"
+    left="157"
+    width="280">
+  </check_box>
   <view_border
     bevel_style="in"
     height="0"
     layout="topleft"
-    name="border3"
+    name="border5"
     top_pad="10"
     left="20"
     width="540"/>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_presets.xml b/indra/newview/skins/default/xui/en/panel_performance_presets.xml
deleted file mode 100644
index 51516020a2..0000000000
--- a/indra/newview/skins/default/xui/en/panel_performance_presets.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bevel_style="none"
- follows="left|top"
- height="490"
- width="580"
- name="panel_performance_presets"
- layout="topleft"
- left="0"
- top="0">
-  <button
-    height="16"
-    width="16"
-    layout="topleft"
-    mouse_opaque="true"
-    follows="left|top"
-    name="back_btn"
-    top="7"
-    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="10"
-   name="back_lbl"
-   width="40">
-    Back
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifLarge"
-   text_color="White"
-   height="20"
-   layout="topleft"
-   left="20"
-   top_pad="10"
-   name="presets_title"
-   width="300">
-    Quick settings
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="5"
-   name="presets_desc"
-   width="580">
-    Note: Quick settings will reset all manual changes you have made.
-  </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="top_border"
-    top_pad="12"
-    width="540"/>
-  <button
-    follows="top|left"
-    height="23"
-    label="Social"
-    label_color="White"
-    layout="topleft"
-    name="social"
-    top_pad="14"
-    width="130">
-  </button>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="14"
-   name="social_desc1"
-   width="580">
-    Tuned for many avatars in a room.
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="5"
-   name="social_desc2"
-   width="180">
-    Nearby avatar complexity is high.
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   height="18"
-   layout="topleft"
-   left_pad="5"
-   name="avatars_nearby_link"
-   skip_link_underline="true"
-   width="200">
-    [secondlife:/// Choose avatars to show and hide]
-  </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="social_border"
-    left="20"
-    top_pad="12"
-    width="540"/>
-  <button
-    follows="top|left"
-    height="23"
-    label="Outdoors"
-    label_color="White"
-    layout="topleft"
-    name="outdoors"
-    top_pad="14"
-    width="130">
-  </button>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="14"
-   name="outdoors_desc"
-   width="580">
-    Fewer avatars, higher visibility distance.
-  </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="outdoors_border"
-    top_pad="12"
-    width="540"/>
-  <button
-    follows="top|left"
-    height="23"
-    label="Maximum distance"
-    label_color="White"
-    layout="topleft"
-    name="max_distance"
-    top_pad="14"
-    width="130">
-  </button>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="14"
-   name="max_distance_desc"
-   width="580">
-    Good for zooming your camera far out and viewing large land areas.
-  </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="max_distance_border"
-    top_pad="12"
-    width="540"/>
-  <button
-    follows="top|left"
-    height="23"
-    label="Photography"
-    label_color="White"
-    layout="topleft"
-    name="photography"
-    top_pad="14"
-    width="130">
-  </button>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="14"
-   name="photography_desc"
-   width="580">
-    Maximum quality, minimum visibility distance.
-  </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="photography_border"
-    top_pad="12"
-    width="540"/>
-    <text
-     follows="left|top"
-     font="SansSerifSmall"
-     text_color="White"
-     height="18"
-     layout="topleft"
-     top_pad="14"
-     name="settings_desc"
-     width="110">
-    For more control, try
-  </text>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   height="18"
-   layout="topleft"
-   left_pad="3"
-   name="settings_link"
-   skip_link_underline="true"
-   width="200">
-    [secondlife:/// Idividual Settings]
-  </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
deleted file mode 100644
index 0a14eeb1c0..0000000000
--- a/indra/newview/skins/default/xui/en/panel_performance_troubleshooting.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="7"
-    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="10"
-   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>
-- 
cgit v1.2.3


From 928191f525cf8a02816718eefd9a65097d8ecb8b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 19 Jul 2021 20:07:03 +0300
Subject: SL-15297 performance floater UI update #2

---
 .../skins/default/xui/en/floater_performance.xml   | 42 ++++++------
 .../skins/default/xui/en/menu_attachment_other.xml | 28 ++++----
 .../skins/default/xui/en/menu_avatar_other.xml     | 64 +++++++++---------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 15 ++---
 .../xui/en/panel_performance_complexity.xml        | 20 ++++--
 .../default/xui/en/panel_performance_huds.xml      |  4 +-
 .../default/xui/en/panel_performance_nearby.xml    | 75 ++++++++++++++++++++--
 .../xui/en/panel_performance_preferences.xml       | 47 +++++---------
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 9 files changed, 178 insertions(+), 119 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 210b2f8792..c47b8100c2 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="692"
+ height="592"
  layout="topleft"
  name="performance"
  save_rect="true"
@@ -47,7 +47,7 @@
        text_color="White"
        height="20"
        layout="topleft"
-       left_pad="0"
+       left_pad="3"
        top="13"
        name="fps_lbl"
        width="450">
@@ -93,7 +93,7 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="70"
+     height="50"
      width="560"
      name="settings_subpanel"
      layout="topleft"
@@ -107,7 +107,7 @@
          layout="topleft"
          left="10"
          name="settings_lbl"
-         top="12"
+         top="7"
          width="180">
           Graphics settings
         </text>
@@ -119,7 +119,7 @@
          layout="topleft"
          left="10"
          name="settings_desc"
-         top_pad="10"
+         top_pad="0"
          width="395">
           Choose settings for distance, water, lighting and more.
         </text>
@@ -130,7 +130,7 @@
          mouse_opaque="true"
          name="icon_arrow3"
          follows="right|top"
-         top="29"
+         top="19"
          right="-20"/>
       </panel>
     <panel
@@ -140,11 +140,11 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="70"
+     height="50"
      width="560"
      name="nearby_subpanel"
      layout="topleft"
-     top_pad="20">
+     top_pad="10">
       <text
        follows="left|top"
        font="SansSerifLarge"
@@ -153,7 +153,7 @@
        layout="topleft"
        left="10"
        name="avatars_nearby_lbl"
-       top="12"
+       top="7"
        width="205">
           Avatars nearby
       </text>
@@ -165,7 +165,7 @@
        layout="topleft"
        left="10"
        name="avatars_nearby_desc"
-       top_pad="10"
+       top_pad="0"
        width="395">
           Manage which nearby avatars are fully displayed.
       </text>
@@ -176,7 +176,7 @@
        mouse_opaque="true"
        name="icon_arrow2"
        follows="right|top"
-       top="29"
+       top="19"
        right="-20"/>
     </panel>
     <panel
@@ -186,11 +186,11 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="70"
+     height="50"
      width="560"
      name="complexity_subpanel"
      layout="topleft"
-     top_pad="20">
+     top_pad="10">
       <text
        follows="left|top"
        font="SansSerifLarge"
@@ -199,7 +199,7 @@
        layout="topleft"
        left="10"
        name="complexity_lbl"
-       top="12"
+       top="7"
        width="180">
           Your avatar complexity
       </text>
@@ -211,7 +211,7 @@
        layout="topleft"
        left="10"
        name="complexity_info"
-       top_pad="10"
+       top_pad="0"
        width="455">
           Reduce the complexity of your avatar if you aren't satisfied with current FPS.
       </text>
@@ -222,7 +222,7 @@
        mouse_opaque="true"
        name="icon_arrow4"
        follows="right|top"
-       top="29"
+       top="19"
        right="-20"/>
     </panel>
     <panel
@@ -232,11 +232,11 @@
      border="true"
      bevel_style="none"
      follows="left|top"
-     height="70"
+     height="50"
      width="560"
      name="huds_subpanel"
      layout="topleft"
-     top_pad="20">
+     top_pad="10">
       <text
        follows="left|top"
        font="SansSerifLarge"
@@ -245,7 +245,7 @@
        layout="topleft"
        left="10"
        name="huds_lbl"
-       top="12"
+       top="7"
        width="135">
           Your active HUDs
       </text>
@@ -257,7 +257,7 @@
        layout="topleft"
        left="10"
        name="huds_desc"
-       top_pad="10"
+       top_pad="0"
        width="395">
           Removing HUDs you are not using can improve speed.
       </text>
@@ -268,7 +268,7 @@
        mouse_opaque="true"
        name="icon_arrow4"
        follows="right|top"
-       top="29"
+       top="19"
        right="-20"/>
     </panel>
   </panel>
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 7ad692038e..22006c287f 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -131,22 +131,12 @@
 
    <menu_item_separator />
       <context_menu
-       label="Render Avatar"
+       label="Display this avatar"
        layout="topleft"
-        name="Render Avatar">
-      <menu_item_check
-        name="RenderNormally"
-        label="Default">
-        <menu_item_check.on_check
-          function="Avatar.CheckImpostorMode"
-          parameter="0" />
-	    <menu_item_check.on_click
-	      function="Avatar.SetImpostorMode"
-	      parameter="0" />
-      </menu_item_check>
+       name="Render Avatar">
       <menu_item_check
         name="AlwaysRenderFully"
-        label="Always">
+        label="Always full detail">
         <menu_item_check.on_check
           function="Avatar.CheckImpostorMode"
           parameter="2" />
@@ -156,7 +146,7 @@
       </menu_item_check>
       <menu_item_check
         name="DoNotRender"
-        label="Never">
+        label="Never full detail">
         <menu_item_check.on_check
           function="Avatar.CheckImpostorMode"
           parameter="1" />
@@ -164,6 +154,16 @@
 	      function="Avatar.SetImpostorMode"
 	      parameter="1" />
       </menu_item_check>
+      <menu_item_call
+        name="RenderNormally"
+        label="Remove from exceptions">
+          <menu_item_call.on_visible
+            function="Avatar.CheckImpostorMode"
+            parameter="4" />
+          <menu_item_call.on_click
+            function="Avatar.SetImpostorMode"
+            parameter="0" />
+      </menu_item_call>
       <menu_item_separator />
       <menu_item_call
         label="Exceptions..."
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index acbb9b860d..665eb9a82f 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -122,39 +122,39 @@
    <menu_item_separator />
     
  <context_menu
-       label="Render Avatar"
+       label="Display this avatar"
        layout="topleft"
-        name="Render Avatar">
-      <menu_item_check
-        name="RenderNormally"
-        label="Default">
-        <menu_item_check.on_check
-          function="Avatar.CheckImpostorMode"
-          parameter="0" />
-	    <menu_item_check.on_click
-	      function="Avatar.SetImpostorMode"
-	      parameter="0" />
-      </menu_item_check>
-      <menu_item_check
-        name="AlwaysRenderFully"
-        label="Always">
-        <menu_item_check.on_check
-          function="Avatar.CheckImpostorMode"
-          parameter="2" />
-	    <menu_item_check.on_click
-	      function="Avatar.SetImpostorMode"
-	      parameter="2" />
-      </menu_item_check>
-      <menu_item_check
-        name="DoNotRender"
-        label="Never">
-        <menu_item_check.on_check
-          function="Avatar.CheckImpostorMode"
-          parameter="1" />
-	    <menu_item_check.on_click
-	      function="Avatar.SetImpostorMode"
-	      parameter="1" />
-      </menu_item_check>
+       name="Render Avatar">
+       <menu_item_check
+         name="AlwaysRenderFully"
+         label="Always full detail">
+         <menu_item_check.on_check
+           function="Avatar.CheckImpostorMode"
+           parameter="2" />
+         <menu_item_check.on_click
+           function="Avatar.SetImpostorMode"
+           parameter="2" />
+       </menu_item_check>
+       <menu_item_check
+         name="DoNotRender"
+         label="Never full detail">
+         <menu_item_check.on_check
+           function="Avatar.CheckImpostorMode"
+           parameter="1" />
+         <menu_item_check.on_click
+           function="Avatar.SetImpostorMode"
+           parameter="1" />
+       </menu_item_check>
+       <menu_item_call
+         name="RenderNormally"
+         label="Remove from exceptions">
+         <menu_item_call.on_visible
+           function="Avatar.CheckImpostorMode"
+           parameter="4" />
+         <menu_item_call.on_click
+           function="Avatar.SetImpostorMode"
+           parameter="0" />
+       </menu_item_call>
       <menu_item_separator />
       <menu_item_call
         label="Exceptions..."
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 177f995b12..b1adf97444 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -126,13 +126,6 @@
             <menu_item_call.on_click
              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..."
@@ -860,7 +853,13 @@
                parameter="UseDebugMenus" />
           </menu_item_check>
         </menu>
-
+        <menu_item_call
+          label="Improve graphics speed..."
+          name="Performance">
+          <menu_item_call.on_click
+           function="Floater.Toggle"
+           parameter="performance" />
+        </menu_item_call>
         <menu_item_separator/>
     <!--    <menu_item_check
          label="Show Navigation Bar"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index b2f65f9488..40159314f7 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="490"
+ height="530"
  width="580"
  name="panel_performance_complexity"
  layout="topleft"
@@ -54,7 +54,7 @@
    left="20"
    name="attachments_desc1"
    width="580">
-    If your avatar is very complex, some other people may not see you in full detail and
+    Attachments make your avatar more complex. If your avatar is very complex, some other 
   </text>
   <text
    follows="left|top"
@@ -66,12 +66,24 @@
    left="20"
    name="attachments_desc2"
    width="580">
-    your own graphics speed may be reduced.
+    people may not see you in full detail, and your graphics speed may be reduced. Removing
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   left="20"
+   name="attachments_desc3"
+   width="580">
+    heavy attachments that you don’t need can help.
   </text>
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="220"
+    height="379"
     follows="left|top"
     layout="topleft"
     name="obj_list"
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 7dcadc557b..eea6b79e30 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="490"
+ height="530"
  width="580"
  name="panel_performance_huds"
  layout="topleft"
@@ -71,7 +71,7 @@
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="220"
+    height="400"
     follows="left|top"
     layout="topleft"
     name="hud_list"
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 4cc7ffda40..e1aef13717 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="490"
+ height="530"
  width="580"
  name="panel_performance_nearby"
  layout="topleft"
@@ -54,7 +54,7 @@
    top_pad="5"
    name="av_nearby_desc"
    width="580">
-    Avatars more complex than your chosen limit will be shown in silhouette.
+    Hide the most complex avatars to boost speed.
   </text>
   <slider
     control_name="IndirectMaxComplexity"
@@ -63,7 +63,7 @@
     height="16"
     initial_value="101"
     increment="1"
-    label="Maximum avatar complexity"
+    label="Maximum complexity (K)"
     text_color="White"
     label_width="165"
     layout="topleft"
@@ -90,11 +90,12 @@
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="220"
+    height="280"
     left="20"
     follows="left|top"
     layout="topleft"
     sort_column="complex_value"
+    short_names="true"
     name="nearby_list"
     name_column="name"
     top_pad="10"
@@ -144,6 +145,70 @@
     left="18"
     width="256">
   </check_box>
-
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border"
+    top_pad="15"
+    left="20"
+    width="540"/>
+  <check_box
+    height="16"
+    initial_value="true"
+    label="Hide avatars completely (good for landscape photos)"
+    layout="topleft"
+    name="hide_avatars"
+    top_delta="15"
+    left="18"
+    width="280">
+   </check_box>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="15"
+   layout="topleft"
+   left="20"
+   name="name_tags_textbox"
+   top_pad="10"
+   width="400">
+    Name tags:
+  </text>
+  <radio_group
+    control_name="AvatarNameTagMode"
+    height="20"
+    layout="topleft"
+    left="120"
+    top_delta="0"
+    name="name_tag_mode">
+    <radio_item
+     label="Off"
+     name="radio"
+     top_delta="20"
+     layout="topleft"
+     height="16"
+     left="0"
+     value="0"
+     width="75" />
+    <radio_item
+     label="On"
+     left_pad="0"
+     layout="topleft"
+     top_delta="0"
+     height="16"
+     name="radio2"
+     value="1"
+     width="75" />
+    <radio_item
+     label="Show briefly"
+     left_pad="0"
+     name="radio3"
+     height="16"
+     layout="topleft"
+     top_delta="0"
+     value="2"
+     width="160" />
+  </radio_group>
  
 </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
index fb62e7beb3..221dfa0222 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="630"
+ height="530"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -44,11 +44,21 @@
    width="300">
     Graphics settings
   </text>
+  <button
+    follows="top|left"
+    height="23"
+    label="Open Advanced Settings"
+    layout="topleft"
+    left="360"
+    name="advanced_btn"
+    top_delta="0"
+    width="200"/>
   <view_border
     bevel_style="in"
     height="0"
     layout="topleft"
     name="border1"
+    left="20"
     top_pad="8"
     width="540"/>
   <text
@@ -156,7 +166,7 @@
     height="0"
     layout="topleft"
     name="border2"
-    top_pad="15"
+    top_pad="5"
     left="20"
     width="540"/>
   <text
@@ -238,7 +248,7 @@
     height="0"
     layout="topleft"
     name="border3"
-    top_pad="15"
+    top_pad="5"
     left="20"
     width="540"/>
   <text
@@ -325,7 +335,7 @@
     height="0"
     layout="topleft"
     name="border3"
-    top_pad="15"
+    top_pad="7"
     left="20"
     width="540"/>
   <text
@@ -418,7 +428,7 @@
     height="0"
     layout="topleft"
     name="border4"
-    top_pad="15"
+    top_pad="7"
     left="20"
     width="540"/>
   <text
@@ -469,33 +479,6 @@
    width="180">
       (Enter value between 0.0 and 4.0)
   </text>
-  <check_box
-    height="16"
-    initial_value="true"
-    label="Hide avatars completely (good for landscape photos)"
-    layout="topleft"
-    name="hide_avatars"
-    top_delta="29"
-    left="157"
-    width="280">
-  </check_box>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="border5"
-    top_pad="10"
-    left="20"
-    width="540"/>
-  <button
-    follows="top|left"
-    height="23"
-    label="Open Advanced Settings"
-    layout="topleft"
-    left="160"
-    name="advanced_btn"
-    top_pad="12"
-    width="200"/>
   <text
    follows="left|top"
    font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d115e09d5b..db6fbfe362 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4271,7 +4271,7 @@ Try enclosing path to the editor with double quotes.
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>
   <string name="none_paren_cap">(None)</string>
-  <string name="no_limit">No Limit</string>
+  <string name="no_limit">No limit</string>
   
   <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
       The physics shape contains triangles which are too small. Try simplifying the physics model.
-- 
cgit v1.2.3


From 130e915007d3b95412abf1dc069adfb87a5e372c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 21 Jul 2021 18:10:25 +0300
Subject: SL-15297 toolbar button is added & changing quality via radio group
 is handled correctly now

---
 indra/newview/skins/default/textures/textures.xml         |   1 +
 .../skins/default/textures/toolbar_icons/performance.png  | Bin 0 -> 451 bytes
 indra/newview/skins/default/xui/en/strings.xml            |   2 ++
 3 files changed, 3 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/performance.png

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 03878d9fe7..cf5be9afa5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -151,6 +151,7 @@ with the same filename but different name
   <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png"         preload="true" />
   <texture name="Command_Environments_Icon" file_name="toolbar_icons/environments.png" preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
+  <texture name="Command_Performance_Icon"  file_name="toolbar_icons/performance.png"  preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
   <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
   <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/performance.png b/indra/newview/skins/default/textures/toolbar_icons/performance.png
new file mode 100644
index 0000000000..91baf849c8
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/performance.png differ
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index db6fbfe362..edf904226e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4143,6 +4143,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Walk / run / fly</string>
   <string name="Command_People_Label">People</string>
+  <string name="Command_Performance_Label">Graphics speed</string>
   <string name="Command_Picks_Label">Picks</string>
   <string name="Command_Places_Label">Places</string>
   <string name="Command_Preferences_Label">Preferences</string>
@@ -4173,6 +4174,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_MiniMap_Tooltip">Show nearby people</string>
   <string name="Command_Move_Tooltip">Moving your avatar</string>
   <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
+  <string name="Command_Performance_Tooltip">Improve graphics speed</string>
   <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
   <string name="Command_Places_Tooltip">Places you've saved</string>
   <string name="Command_Preferences_Tooltip">Preferences</string>
-- 
cgit v1.2.3


From 2cc718d1b6d3ab7978b5f02c6d07391fe3cb8c3a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 22 Jul 2021 12:36:25 +0300
Subject: SL-15625 FIXED Low digit of fps sometimes does not display

---
 indra/newview/skins/default/xui/en/floater_performance.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index c47b8100c2..84ee9d3c00 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -38,8 +38,8 @@
        left="20"
        top="8"
        name="fps_value"
-       width="40">
-          75
+       width="42">
+          167
       </text>
       <text
        follows="left|top"
-- 
cgit v1.2.3


From 5d73bbef002378f6367807b2a64061f403a840eb Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 2 Aug 2021 14:21:13 +0300
Subject: SL-15736 Show checkmark in the menu while Improve Graphics Speed
 floater is open

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b1adf97444..9c27fb05db 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -853,13 +853,16 @@
                parameter="UseDebugMenus" />
           </menu_item_check>
         </menu>
-        <menu_item_call
+        <menu_item_check
           label="Improve graphics speed..."
           name="Performance">
-          <menu_item_call.on_click
+          <menu_item_check.on_click
            function="Floater.Toggle"
            parameter="performance" />
-        </menu_item_call>
+          <menu_item_check.on_check
+           function="Floater.Visible"
+           parameter="performance" />
+        </menu_item_check>
         <menu_item_separator/>
     <!--    <menu_item_check
          label="Show Navigation Bar"
-- 
cgit v1.2.3


From d7603ffc9c94a6cdab94bc23745903c7fff25ff1 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 24 Jan 2022 16:33:44 +0200
Subject: SL-16627 AutoFPS first pass

---
 .../xui/en/floater_preferences_graphics_advanced.xml  |  9 ++++++++-
 indra/newview/skins/default/xui/en/notifications.xml  | 13 +++++++++++++
 .../default/xui/en/panel_performance_preferences.xml  |  5 ++++-
 .../default/xui/en/panel_preferences_graphics1.xml    | 19 +++++++++++++++++--
 4 files changed, 42 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index d1e167df64..5978ae685a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -39,7 +39,10 @@
     max_val="512"
     name="DrawDistance"
     top_delta="16"
-    width="330" />
+    width="330">
+    <slider.mouse_down_callback
+      function="Pref.MouseDown" />
+    </slider>
   <text
     type="string"
     length="1"
@@ -182,6 +185,8 @@
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxNonImpostors"
       parameter="IndirectNonImpostorsText" />
+    <slider.mouse_down_callback
+      function="Pref.MouseDown" />
   </slider>
   <text
     type="string"
@@ -850,6 +855,8 @@
    top_delta="0" 
    name="ShadowDetail"
    width="150">
+    <combo_box.mouse_down_callback
+ function="Pref.MouseDown" />
      <combo_box.item
        label="None"
        name="0"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d4f71fb370..2fed214d69 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1847,6 +1847,19 @@ Graphics Quality can be raised in Preferences &gt; Graphics.
   <tag>fail</tag>
   </notification>
 
+  <notification
+ icon="alertmodal.tga"
+ name="AutoFPSConfirmDisable"
+ type="alertmodal">
+    Changing this setting will disable automatic adjustment and turn off 'Auto FPS' setting.
+Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Continue"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="RegionNoTerraforming"
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 221dfa0222..60792c2f7d 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -206,7 +206,10 @@
     max_val="512"
     name="draw_distance"
     left_pad="5"
-    width="250" />
+    width="250">
+    <slider.mouse_down_callback
+      function="Pref.MouseDown" />
+  </slider>
   <text
     type="string"
     length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 5aff7a5127..6e4a1a6859 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -217,7 +217,10 @@
     max_val="512"
     name="DrawDistance"
     top_delta="40"
-    width="330" />
+    width="330">
+    <slider.mouse_down_callback
+      function="Pref.MouseDown" />
+  </slider>
   <text
     type="string"
     length="1"
@@ -258,6 +261,18 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
+
+  <check_box
+    control_name="AutoFPS"
+    height="16"
+    initial_value="true"
+    label="Auto FPS"
+    layout="topleft"
+    left="30"
+    name="AutoFPS"
+    top_delta="30"
+    width="256">
+  </check_box>
   
   <slider
     control_name="IndirectMaxComplexity"
@@ -274,7 +289,7 @@
     max_val="101"
     name="IndirectMaxComplexity"
     show_text="false"
-    top_delta="60"
+    top_delta="34"
     width="300">
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxComplexity"
-- 
cgit v1.2.3


From b50de181623874ab799fdc31532dffe8f7bc610a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 25 Jan 2022 19:43:32 +0200
Subject: SL-16627 add auto-adjustment warning for affected settings

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml  | 6 +++---
 .../newview/skins/default/xui/en/panel_performance_preferences.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 5978ae685a..65b96d3694 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -41,7 +41,7 @@
     top_delta="16"
     width="330">
     <slider.mouse_down_callback
-      function="Pref.MouseDown" />
+      function="Pref.AutoAdjustWarning" />
     </slider>
   <text
     type="string"
@@ -186,7 +186,7 @@
       function="Pref.UpdateIndirectMaxNonImpostors"
       parameter="IndirectNonImpostorsText" />
     <slider.mouse_down_callback
-      function="Pref.MouseDown" />
+      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
@@ -856,7 +856,7 @@
    name="ShadowDetail"
    width="150">
     <combo_box.mouse_down_callback
- function="Pref.MouseDown" />
+ function="Pref.AutoAdjustWarning" />
      <combo_box.item
        label="None"
        name="0"
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 60792c2f7d..5fd6af24c1 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -208,7 +208,7 @@
     left_pad="5"
     width="250">
     <slider.mouse_down_callback
-      function="Pref.MouseDown" />
+      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6e4a1a6859..f73149e77e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -219,7 +219,7 @@
     top_delta="40"
     width="330">
     <slider.mouse_down_callback
-      function="Pref.MouseDown" />
+      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
-- 
cgit v1.2.3


From 7af2d51f57416cb68b435cecfd4eacf5d1a4c9fc Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Feb 2022 12:46:23 +0200
Subject: SL-15923 increase the shortcut level to the minimum required when
 clicking advanced lighting or shadows settings

---
 .../newview/skins/default/xui/en/notifications.xml | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2fed214d69..e01865a5ea 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1848,9 +1848,9 @@ Graphics Quality can be raised in Preferences &gt; Graphics.
   </notification>
 
   <notification
- icon="alertmodal.tga"
- name="AutoFPSConfirmDisable"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="AutoFPSConfirmDisable"
+   type="alertmodal">
     Changing this setting will disable automatic adjustment and turn off 'Auto FPS' setting.
 Are you sure you want to continue?
     <tag>confirm</tag>
@@ -1859,6 +1859,28 @@ Are you sure you want to continue?
      notext="Cancel"
      yestext="Continue"/>
   </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="AdvancedLightingConfirm"
+   type="alertmodal">
+To turn on advanced lighting, we need to increase quality to level 4.
+    <tag>confirm</tag>
+  <usetemplate
+   name="okcancelbuttons"
+   notext="Cancel"
+   yestext="OK"/>
+  </notification>
+  <notification
+ icon="alertmodal.tga"
+   name="ShadowsConfirm"
+   type="alertmodal">
+To enable shadows, we need to increase quality to level 4.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 882600de2afa366729be870355767282247be0ef Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 18 Feb 2022 18:30:59 +0200
Subject: SL-16627 water reflection detail settings should be affected by
 auto-adjustment

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 65b96d3694..b02eb62112 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -697,6 +697,8 @@
     top_delta="0"
     name="Reflections"
     width="150">
+      <combo_box.mouse_down_callback
+        function="Pref.AutoAdjustWarning" />
       <combo_box.item
         label="None; opaque"
         name="0"
-- 
cgit v1.2.3


From 6ab4aeb14878a091a04324c87f5f40d9270f7897 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 9 Mar 2022 13:22:26 +0200
Subject: SL-16627 Enable auto-adjustments for frist login and update UI

---
 .../skins/default/xui/en/floater_performance.xml   |  2 +-
 .../xui/en/panel_performance_complexity.xml        |  4 +-
 .../default/xui/en/panel_performance_huds.xml      |  4 +-
 .../xui/en/panel_performance_preferences.xml       | 55 +++++++++++++++++-----
 .../default/xui/en/panel_preferences_graphics1.xml | 37 +++++++++------
 5 files changed, 72 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 84ee9d3c00..0107c59868 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="592"
+ height="642"
  layout="topleft"
  name="performance"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index 40159314f7..954fd0a8c1 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="530"
+ height="580"
  width="580"
  name="panel_performance_complexity"
  layout="topleft"
@@ -83,7 +83,7 @@
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="379"
+    height="429"
     follows="left|top"
     layout="topleft"
     name="obj_list"
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 eea6b79e30..289f865eb7 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="530"
+ height="580"
  width="580"
  name="panel_performance_huds"
  layout="topleft"
@@ -71,7 +71,7 @@
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="400"
+    height="450"
     follows="left|top"
     layout="topleft"
     name="hud_list"
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 5fd6af24c1..1eee799986 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="530"
+ height="580"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -54,13 +54,46 @@
     top_delta="0"
     width="200"/>
   <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="border1"
-    left="20"
-    top_pad="8"
-    width="540"/>
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border0"
+   top_pad="8"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="20"
+   left="20"
+   name="auto_lbl"
+   width="105">
+    Automatic settings
+  </text>
+  <check_box
+   control_name="AutoFPS"
+   height="16"
+   initial_value="true"
+   label="Allow system to choose settings for best experience"
+   label_text.text_color="White"
+   label_text.v_pad="-1"
+   label_text.h_pad="3"
+   layout="topleft"
+   left_pad="30"
+   name="AutoFPS"
+   width="256">
+  </check_box>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border1"
+   left="20"
+   top_pad="12"
+   width="540"/>
   <text
    follows="left|top"
    font="SansSerifSmall"
@@ -70,7 +103,7 @@
    top_pad="30"
    name="quality_lbl"
    width="100">
-    Shortcuts
+    Quality &amp; Speed
   </text>
   <text
    follows="left|top"
@@ -362,7 +395,7 @@
    top_delta="0"
    left="160"
    name="water_desc"
-   width="350">
+   width="380">
     Reducing or turning off water effects can greatly improve frame rate.
   </text>
   <check_box
@@ -487,7 +520,7 @@
    font="SansSerifSmall"
    height="18"
    layout="topleft"
-   top="78"
+   top="130"
    left="213"
    name="1_lbl"
    width="7">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f73149e77e..93cb3ea9c8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -30,7 +30,28 @@
     width="120">
       (None)
   </text>
-
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border1"
+    left="12"
+    top_pad="12"
+    width="477"/>
+  <check_box
+    control_name="AutoFPS"
+    height="16"
+    initial_value="true"
+    label="Allow system to choose settings for best experience"
+    label_text.text_color="White"
+    label_text.v_pad="-1"
+    label_text.h_pad="5"
+    layout="topleft"
+    left="10"
+    name="AutoFPS"
+    top_delta="15"
+    width="256">
+  </check_box>
   <text
     type="string"
     length="1"
@@ -39,7 +60,7 @@
     layout="topleft"
     left="10"
     name="QualitySpeed"
-    top_delta="35" 
+    top_delta="30" 
     width="400">
       Quality &amp; speed:
   </text>
@@ -262,18 +283,6 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <check_box
-    control_name="AutoFPS"
-    height="16"
-    initial_value="true"
-    label="Auto FPS"
-    layout="topleft"
-    left="30"
-    name="AutoFPS"
-    top_delta="30"
-    width="256">
-  </check_box>
-  
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
-- 
cgit v1.2.3


From e5e710a1e6e0f74cd60647e3dae7d037076351ff Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 17 Mar 2022 18:47:42 +0200
Subject: SL-16627 show auto-adjustment warning when for Shadows quality and
 Water reflection settings

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml    | 4 ----
 indra/newview/skins/default/xui/en/notifications.xml                  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index b02eb62112..154c8b7909 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -697,8 +697,6 @@
     top_delta="0"
     name="Reflections"
     width="150">
-      <combo_box.mouse_down_callback
-        function="Pref.AutoAdjustWarning" />
       <combo_box.item
         label="None; opaque"
         name="0"
@@ -857,8 +855,6 @@
    top_delta="0" 
    name="ShadowDetail"
    width="150">
-    <combo_box.mouse_down_callback
- function="Pref.AutoAdjustWarning" />
      <combo_box.item
        label="None"
        name="0"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 98f74d321b..1b9df53ad2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1864,7 +1864,7 @@ Graphics Quality can be raised in Preferences &gt; Graphics.
    icon="alertmodal.tga"
    name="AutoFPSConfirmDisable"
    type="alertmodal">
-    Changing this setting will disable automatic adjustment and turn off 'Auto FPS' setting.
+Changing this setting will disable automatic adjustment and turn off 'Automatic settings'.
 Are you sure you want to continue?
     <tag>confirm</tag>
     <usetemplate
-- 
cgit v1.2.3


From ba9bff5b9bdd7904916c3ae844840c87376498c3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 8 Jun 2022 01:21:42 +0300
Subject: SL-17541 Show the message that user is currently at maximum FPS

---
 indra/newview/skins/default/xui/en/floater_performance.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 0107c59868..bf2623f356 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -6,6 +6,12 @@
  save_rect="true"
  title="IMPROVE GRAPHICS SPEED"
  width="580">
+  <string
+   name="fps_text"
+   value="frames per second"/>
+  <string
+   name="max_text"
+   value=" (maximum)"/>
   <panel
    bevel_style="none"
    follows="left|top"
@@ -35,7 +41,7 @@
        text_color="White"
        height="20"
        layout="topleft"
-       left="20"
+       left="10"
        top="8"
        name="fps_value"
        width="42">
-- 
cgit v1.2.3


From b66f2e7da7d3ec68984d7fcb5e5996e1451c0baf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 21 Sep 2022 21:19:17 +0300
Subject: SL-18202 WIP merging autotune contribution and updating UI

---
 .../skins/default/xui/en/floater_performance.xml   |  54 ++++
 .../xui/en/panel_performance_autoadjustments.xml   | 272 +++++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index bf2623f356..ee88701037 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -277,6 +277,52 @@
        top="19"
        right="-20"/>
     </panel>
+    <panel
+     bg_alpha_color="PanelGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
+     follows="left|top"
+     height="50"
+     width="560"
+     name="autoadjustments_subpanel"
+     layout="topleft"
+     top_pad="10">
+      <text
+       follows="left|top"
+       font="SansSerifLarge"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="auto_adj_lbl"
+       top="7"
+       width="175">
+        Preferred frame rate
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerif"
+       text_color="White"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="auto_adj_desc"
+       top_pad="0"
+       width="485">
+        Allow automatic adjustments to reach your preferred frame rate (advanced).
+      </text>
+      <icon
+       height="16"
+       width="16"
+       image_name="Arrow_Right_Off"
+       mouse_opaque="true"
+       name="icon_arrow4"
+       follows="right|top"
+       top="19"
+       right="-20"/>
+    </panel>
   </panel>
   <panel
     filename="panel_performance_nearby.xml"
@@ -310,4 +356,12 @@
     name="panel_performance_huds"
     visible="false"
     top="55" />
+  <panel
+    filename="panel_performance_autoadjustments.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_performance_autoadjustments"
+    visible="false"
+    top="55" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
new file mode 100644
index 0000000000..10ac4b98b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="left|top"
+ height="580"
+ width="580"
+ name="panel_performance_autoadjustments"
+ layout="topleft"
+ left="0"
+ top="0">
+  <button
+    height="16"
+    width="16"
+    layout="topleft"
+    mouse_opaque="true"
+    follows="left|top"
+    name="back_btn"
+    top="7"
+    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="10"
+   name="back_lbl"
+   width="40">
+    Back
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifLarge"
+   text_color="white"
+   height="20"
+   layout="topleft"
+   left="20"
+   top_pad="10"
+   name="settings_title"
+   width="300">
+    Preferred frame rate
+  </text>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border0"
+   top_pad="15"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerif"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   left="20"
+   name="targetfps_desc"
+   wrap="true"
+   width="140"
+   top_pad="20">
+    Desired frame rate
+  </text>
+  <spinner
+   name="target_fps"
+   control_name="TargetFPS"
+   font="SansSerifLarge"
+   tool_tip="The viewer will attempt to achieve this by adjusting your graphics settings."
+   layout="topleft"
+   follows="right|top"
+   left_pad="5"
+   top_delta="0"
+   height="25"
+   visible="true"
+   decimal_digits="0"
+   increment="1"
+   initial_value="25"
+   max_val="300"
+   min_val="1"
+   width="48"
+   label_width="0" />
+  <button
+   control_name="AutoTuneFPS"
+   follows="top|right"
+   height="24"
+   initial_value="false"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   is_toggle="true"
+   label="Start"
+   label_selected="Stop"
+   layout="topleft"
+   left_pad="10"
+   name="AutoTuneFPS"
+   top_delta="-1"
+   tool_tip="The viewer will attempt to adjust settings to meet the target FPS."
+   width="72">
+  </button>
+  <check_box
+   control_name="AutoTuneLock"
+   follows="top|right"
+   height="20"
+   initial_value="true"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   is_toggle="true"
+   label="Continuous"
+   layout="topleft"
+   left_pad="10"
+   name="AutoTuneContinuous"
+   top_delta="0"
+   tool_tip="The viewer will continually adapt the settings to meet the target FPS until stopped even with the floater closed. When disabled clicking the Auto Tune button will adjust for the current settings then stop."
+   width="64">
+  </check_box>
+  <text
+   follows="left|top"
+   font="SansSerif"
+   text_color="White"
+   height="20"
+   layout="topleft"
+   left="20"
+   name="settings_desc"
+   top_pad="20"
+   wrap="true"
+   width="150">
+    Settings affect
+  </text>
+  <combo_box
+   follows="top|left"
+   font="SansSerif"
+   height="20"
+   layout="topleft"
+   left_pad="15"
+   control_name="TuningFPSStrategy"
+   name="TuningFPSStrategy"
+   width="130">
+    <combo_box.item
+     label="Avatars Only"
+     name="av_only"
+     value="0" />
+    <combo_box.item
+     label="Avatars and Scene"
+     name="av_and_scene"
+     value="1" />
+  </combo_box>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border1"
+   top_pad="20"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="15"
+   name="simplify_dist_desc"
+   width="580">
+    Reducing detail shown on avatars that are far away will improve graphics speed.
+  </text>
+  <check_box
+   control_name="AutoTuneImpostorByDistEnabled"
+   height="19"
+   label="Simplify avatars beyond"
+   label_text.text_color="White"
+   layout="topleft"
+   follows="top|left"
+   name="AutoTuneImpostorByDistEnabled"
+   tool_tip="When enabled the viewer will adjust the MaxNonImpostors setting to limit fully rendered avatars to those within the defined radius."
+   top_pad="15"
+   width="190" />
+  <spinner
+   control_name="AutoTuneImpostorFarAwayDistance"
+   height="20"
+   layout="topleft"
+   follows="top|left"
+   name="ffa_autotune"
+   left_pad="20"
+   decimal_digits="2"
+   min_val="16"
+   max_val="256"
+   width="60" >
+  </spinner>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left_pad="10"
+   name="dist_meters"
+   width="70">
+    meters
+  </text>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border2"
+   top_pad="20"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="20"
+   name="dist_limits_desc"
+   width="580">
+    Choose the distance range that automatic settings will affect.
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="15"
+   name="min_dist_lbl"
+   width="120">
+    Minimum distance
+  </text>
+  <spinner
+   control_name="AutoTuneRenderFarClipMin"
+   height="20"
+   layout="topleft"
+   left_pad="15"
+   follows="top|left"
+   name="min_dd_autotune"
+   decimal_digits="2"
+   min_val="32"
+   max_val="256"
+   width="60">
+  </spinner>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="15"
+   left="20"
+   name="pref_dist_lbl"
+   width="120">
+    Maximum distance
+  </text>
+  <spinner
+   control_name="AutoTuneRenderFarClipTarget"
+   height="20"
+   layout="topleft"
+   follows="top|left"
+   name="pref_dd_autotune"
+   left_pad="15"
+   min_val="32"
+   max_val="256"
+   width="60">
+  </spinner>
+</panel>
-- 
cgit v1.2.3


From 81c287f877a48381bfa212ad00fe23aef260ef5f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 22 Sep 2022 20:34:29 +0300
Subject: SL-18202 WIP merging autotune contribution and updating UI #2

---
 .../default/xui/en/panel_performance_nearby.xml    | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default')

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 e1aef13717..e80bf592e4 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -57,22 +57,22 @@
     Hide the most complex avatars to boost speed.
   </text>
   <slider
-    control_name="IndirectMaxComplexity"
-    tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
+    control_name="RenderAvatarMaxART"
+    tool_tip="Controls when a visually complex avatar is considered to be taking too long to render (unit: microseconds)"
     follows="left|top"
     height="16"
-    initial_value="101"
-    increment="1"
-    label="Maximum complexity (K)"
+    initial_value="4.7"
+    increment="0.01"
+    label="Maximum render time (μs)"
     text_color="White"
     label_width="165"
     layout="topleft"
-    min_val="1"
-    max_val="101"
-    name="IndirectMaxComplexity"
+    min_val="2"
+    max_val="4.7"
+    name="RenderAvatarMaxART"
     show_text="false"
     top_pad="10"
-    width="300">
+    width="490">
   </slider>
   <text
     type="string"
@@ -81,11 +81,11 @@
     height="16"
     layout="topleft"
     top_delta="0"
-    left_delta="304"
+    left_pad="5"
     text_color="White"
-    name="IndirectMaxComplexityText"
+    name="RenderAvatarMaxARTText"
     width="65">
-    0
+    no limit
   </text>
   <name_list
     column_padding="0"
-- 
cgit v1.2.3


From 3098d315a34f6d9e1bdf0f0de4e695a89626282f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 23 Sep 2022 16:49:47 +0300
Subject: SL-18202 remove old autofps

---
 .../en/floater_preferences_graphics_advanced.xml   |  4 ---
 .../xui/en/panel_performance_preferences.xml       | 37 +---------------------
 .../default/xui/en/panel_preferences_graphics1.xml | 34 +++-----------------
 3 files changed, 6 insertions(+), 69 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 154c8b7909..9da6ec093b 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -40,8 +40,6 @@
     name="DrawDistance"
     top_delta="16"
     width="330">
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
     </slider>
   <text
     type="string"
@@ -185,8 +183,6 @@
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxNonImpostors"
       parameter="IndirectNonImpostorsText" />
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
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 1eee799986..ee8105eac9 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -61,39 +61,6 @@
    top_pad="8"
    left="20"
    width="540"/>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
-   top_pad="20"
-   left="20"
-   name="auto_lbl"
-   width="105">
-    Automatic settings
-  </text>
-  <check_box
-   control_name="AutoFPS"
-   height="16"
-   initial_value="true"
-   label="Allow system to choose settings for best experience"
-   label_text.text_color="White"
-   label_text.v_pad="-1"
-   label_text.h_pad="3"
-   layout="topleft"
-   left_pad="30"
-   name="AutoFPS"
-   width="256">
-  </check_box>
-  <view_border
-   bevel_style="in"
-   height="0"
-   layout="topleft"
-   name="border1"
-   left="20"
-   top_pad="12"
-   width="540"/>
   <text
    follows="left|top"
    font="SansSerifSmall"
@@ -240,8 +207,6 @@
     name="draw_distance"
     left_pad="5"
     width="250">
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
@@ -520,7 +485,7 @@
    font="SansSerifSmall"
    height="18"
    layout="topleft"
-   top="130"
+   top="80"
    left="213"
    name="1_lbl"
    width="7">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 93cb3ea9c8..5aff7a5127 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -30,28 +30,7 @@
     width="120">
       (None)
   </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="border1"
-    left="12"
-    top_pad="12"
-    width="477"/>
-  <check_box
-    control_name="AutoFPS"
-    height="16"
-    initial_value="true"
-    label="Allow system to choose settings for best experience"
-    label_text.text_color="White"
-    label_text.v_pad="-1"
-    label_text.h_pad="5"
-    layout="topleft"
-    left="10"
-    name="AutoFPS"
-    top_delta="15"
-    width="256">
-  </check_box>
+
   <text
     type="string"
     length="1"
@@ -60,7 +39,7 @@
     layout="topleft"
     left="10"
     name="QualitySpeed"
-    top_delta="30" 
+    top_delta="35" 
     width="400">
       Quality &amp; speed:
   </text>
@@ -238,10 +217,7 @@
     max_val="512"
     name="DrawDistance"
     top_delta="40"
-    width="330">
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
-  </slider>
+    width="330" />
   <text
     type="string"
     length="1"
@@ -282,7 +258,7 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
-
+  
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
@@ -298,7 +274,7 @@
     max_val="101"
     name="IndirectMaxComplexity"
     show_text="false"
-    top_delta="34"
+    top_delta="60"
     width="300">
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxComplexity"
-- 
cgit v1.2.3


From dcd74c98dc5ab1373f1e7f692fd30dee92472acf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 27 Sep 2022 19:35:49 +0300
Subject: SL-18202 impostor too slow avatars and add autotune settings button
 to Preference

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 5aff7a5127..ad02df3087 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -258,6 +258,18 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
+
+  <button
+  height="23"
+  label="Automatic adjustments settings"
+  layout="topleft"
+  left="30"
+  name="AutoAdjustmentsButton"
+  top_delta="30"
+  width="200">
+    <button.commit_callback
+      function="Pref.AutoAdjustments"/>
+  </button>
   
   <slider
     control_name="IndirectMaxComplexity"
@@ -274,7 +286,7 @@
     max_val="101"
     name="IndirectMaxComplexity"
     show_text="false"
-    top_delta="60"
+    top_delta="40"
     width="300">
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxComplexity"
-- 
cgit v1.2.3


From 198420f9f61bc0f747102a2d5783327f13583be8 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 28 Sep 2022 14:16:16 +0300
Subject: SL-18248 Move frame breakdown stats to 'Scene loading statistics'
 floater

---
 .../default/xui/en/floater_scene_load_stats.xml    | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 2abd8ec5c0..37efbe654e 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -410,6 +410,59 @@
           </stat_view>
 			  </stat_view>
 		  </stat_view>
+      <stat_view 
+        name="frame_stats"
+        label="Frame breakdown"
+        show_label="true">
+          <stat_bar name="packet_loss"
+            label="Scenery"
+            orientation="horizontal"
+            unit_label=" %"
+            stat="scenery_frame_pct"
+            bar_max="100"
+            tick_spacing="0.5"
+            show_bar="false"/>
+          <stat_bar name="packet_loss"
+            label="Avatar"
+            orientation="horizontal"
+            unit_label=" %"
+            stat="avatar_frame_pct"
+            bar_max="100"
+            tick_spacing="0.5"
+            show_bar="false"/>
+          <stat_bar name="packet_loss"
+            label="UI"
+            orientation="horizontal"
+            unit_label=" %"
+            stat="ui_frame_pct"
+            bar_max="100"
+            tick_spacing="0.5"
+            show_bar="false"/>
+          <stat_bar name="packet_loss"
+            label="HUDs"
+            orientation="horizontal"
+            unit_label=" %"
+            stat="huds_frame_pct"
+            bar_max="100"
+            tick_spacing="0.5"
+            show_bar="false"/>
+        <stat_bar name="packet_loss"
+            label="Swap"
+            orientation="horizontal"
+            unit_label=" %"
+            stat="swap_frame_pct"
+            bar_max="100"
+            tick_spacing="0.5"
+            show_bar="false"/>
+        <stat_bar name="packet_loss"
+            label="Tasks"
+            orientation="horizontal"
+            unit_label=" %"
+            stat="idle_frame_pct"
+            bar_max="100"
+            tick_spacing="0.5"
+            show_bar="false"/>
+      </stat_view>
     </container_view>
   </scroll_container>
 </floater>
-- 
cgit v1.2.3


From 0bd3560b3e057f7ca74f4d586a02a29235d46489 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 3 Oct 2022 20:49:08 +0300
Subject: SL-18273 add VSync checkbox to Preferred frame rate pane

---
 .../xui/en/panel_performance_autoadjustments.xml   | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 10ac4b98b7..4c2061bc60 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -149,6 +149,49 @@
      name="av_and_scene"
      value="1" />
   </combo_box>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border_vsync"
+   top_pad="20"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   left="20"
+   top_pad="20"
+   name="vsync_desc"
+   width="580">
+    Synchronize the refresh rate and frame rate of a monitor,
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="3"
+   left="20"
+   name="vsync_desc2"
+   width="580">
+    which can result in smoother performance.
+  </text>
+  <check_box
+   control_name="RenderVSyncEnable"
+   height="16"
+   initial_value="true"
+   label="Enable VSync"
+   label_text.text_color="White"
+   layout="topleft"
+   top_pad="15"
+   name="vsync"
+   tool_tip="Enable Vertical synchronization to reduce screen tearing and stuttering."
+   width="315" />
   <view_border
    bevel_style="in"
    height="0"
-- 
cgit v1.2.3


From 56c87233329cf74c2c9111d8b6a1c262b4c29c1e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 3 Oct 2022 20:56:15 +0300
Subject: SL-18271 update tooltip text for Continuous checkbox

---
 .../newview/skins/default/xui/en/panel_performance_autoadjustments.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 4c2061bc60..5d4ffd232b 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -115,7 +115,7 @@
    left_pad="10"
    name="AutoTuneContinuous"
    top_delta="0"
-   tool_tip="The viewer will continually adapt the settings to meet the target FPS until stopped even with the floater closed. When disabled clicking the Auto Tune button will adjust for the current settings then stop."
+   tool_tip="The viewer will continually adapt the settings to meet the target FPS until stopped even with the floater closed. When disabled clicking the Start button will adjust for the current settings then stop."
    width="64">
   </check_box>
   <text
-- 
cgit v1.2.3


From f0809019f807bdcfec719f32538582ea86edf9e3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Sat, 19 Nov 2022 12:04:33 +0200
Subject: SL-18670 change limits of RenderVolumeLODFactor in Preference similar
 to Distance detail ctrl; update slider text correctly

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 9da6ec093b..11c2d11987 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -522,8 +522,8 @@
     label_width="185"
     layout="topleft"
     left="420"
-    min_val="1"
-    max_val="2"
+    min_val="0"
+    max_val="4"
     name="ObjectMeshDetail"
     show_text="false"
     top_delta="16"
-- 
cgit v1.2.3


From 24839c8cf601cac5dbc9ca49166470f0263f7e3c Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 5 Jan 2023 19:13:57 +0200
Subject: SL-18884 Remove dead spot from Back button

---
 .../default/xui/en/panel_performance_autoadjustments.xml     | 12 +++++++-----
 .../skins/default/xui/en/panel_performance_complexity.xml    | 12 +++++++-----
 .../newview/skins/default/xui/en/panel_performance_huds.xml  | 12 +++++++-----
 .../skins/default/xui/en/panel_performance_nearby.xml        | 12 +++++++-----
 .../skins/default/xui/en/panel_performance_preferences.xml   | 12 +++++++-----
 5 files changed, 35 insertions(+), 25 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 5d4ffd232b..ab7b4d3ee7 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -24,12 +24,14 @@
   </button>
   <text
    follows="left|top"
-   height="20"
+   height="18"
    layout="topleft"
-   left_pad="3"
-   top="10"
+   left_pad="0"
+   valign="center"
+   halign="center"
+   top="6"
    name="back_lbl"
-   width="40">
+   width="32">
     Back
   </text>
   <text
@@ -39,7 +41,7 @@
    height="20"
    layout="topleft"
    left="20"
-   top_pad="10"
+   top_pad="15"
    name="settings_title"
    width="300">
     Preferred frame rate
diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index 954fd0a8c1..cd3f610a92 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -24,12 +24,14 @@
   </button>
   <text
    follows="left|top"
-   height="20"
+   height="18"
    layout="topleft"
-   left_pad="3"
-   top="10"
+   left_pad="0"
+   valign="center"
+   halign="center"
+   top="6"
    name="back_lbl"
-   width="40">
+   width="32">
     Back
   </text>
   <text
@@ -39,7 +41,7 @@
    height="20"
    layout="topleft"
    left="20"
-   top_pad="10"
+   top_pad="15"
    name="attachments_title"
    width="195">
     Your avatar complexity 
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 289f865eb7..2fddcb3b9e 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -24,12 +24,14 @@
   </button>
   <text
    follows="left|top"
-   height="20"
+   height="18"
    layout="topleft"
-   left_pad="3"
-   top="10"
+   left_pad="0"
+   valign="center"
+   halign="center"
+   top="6"
    name="back_lbl"
-   width="40">
+   width="32">
     Back
   </text>
   <text
@@ -39,7 +41,7 @@
    height="20"
    layout="topleft"
    left="20"
-   top_pad="10"
+   top_pad="15"
    name="huds_title"
    width="135">
     Your active HUDs
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 e80bf592e4..cb795e59a9 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -24,12 +24,14 @@
   </button>
   <text
    follows="left|top"
-   height="20"
+   height="18"
    layout="topleft"
-   left_pad="3"
-   top="10"
+   left_pad="0"
+   valign="center"
+   halign="center"
+   top="6"
    name="back_lbl"
-   width="40">
+   width="32">
     Back
   </text>
   <text
@@ -39,7 +41,7 @@
    height="20"
    layout="topleft"
    left="20"
-   top_pad="10"
+   top_pad="15"
    name="av_nearby_title"
    width="205">
     Avatars nearby
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 ee8105eac9..9c1a3ebd9e 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -24,12 +24,14 @@
   </button>
   <text
    follows="left|top"
-   height="20"
+   height="18"
    layout="topleft"
-   left_pad="3"
-   top="10"
+   left_pad="0"
+   valign="center"
+   halign="center"
+   top="6"
    name="back_lbl"
-   width="40">
+   width="32">
     Back
   </text>
   <text
@@ -39,7 +41,7 @@
    height="20"
    layout="topleft"
    left="20"
-   top_pad="10"
+   top_pad="15"
    name="settings_title"
    width="300">
     Graphics settings
-- 
cgit v1.2.3


From 020bfa66ba9f1fee3e403595a1d6c95332bb16f7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 10 Jan 2023 22:53:32 +0200
Subject: SL-18923 Add Reset to default settings button

---
 .../xui/en/panel_performance_preferences.xml       | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default')

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 9c1a3ebd9e..b52c19d5e3 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -47,14 +47,23 @@
     Graphics settings
   </text>
   <button
-    follows="top|left"
-    height="23"
-    label="Open Advanced Settings"
-    layout="topleft"
-    left="360"
-    name="advanced_btn"
-    top_delta="0"
-    width="200"/>
+   follows="top|left"
+   height="23"
+   label="Open Advanced Settings"
+   layout="topleft"
+   left="360"
+   name="advanced_btn"
+   top_delta="-35"
+   width="200"/>
+  <button
+   follows="top|left"
+   height="23"
+   label="Reset to recommended settings"
+   layout="topleft"
+   left="350"
+   name="defaults_btn"
+   top_pad="10"
+   width="210"/>
   <view_border
    bevel_style="in"
    height="0"
-- 
cgit v1.2.3


From c43336d5ed211ab77f2dc12b6cb7442d7544a2f7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 27 Jan 2023 01:33:11 +0200
Subject: SL-18930 Update Autotune panel

---
 .../xui/en/panel_performance_autoadjustments.xml   | 175 ++++++++++++++-------
 1 file changed, 116 insertions(+), 59 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index ab7b4d3ee7..24611c94d6 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -63,7 +63,7 @@
    left="20"
    name="targetfps_desc"
    wrap="true"
-   width="140"
+   width="115"
    top_pad="20">
     Desired frame rate
   </text>
@@ -73,8 +73,8 @@
    font="SansSerifLarge"
    tool_tip="The viewer will attempt to achieve this by adjusting your graphics settings."
    layout="topleft"
-   follows="right|top"
-   left_pad="5"
+   follows="left|top"
+   left_pad="25"
    top_delta="0"
    height="25"
    visible="true"
@@ -85,41 +85,18 @@
    min_val="1"
    width="48"
    label_width="0" />
-  <button
-   control_name="AutoTuneFPS"
-   follows="top|right"
-   height="24"
-   initial_value="false"
-   image_pressed="PushButton_Press"
-   image_pressed_selected="PushButton_Selected_Press"
-   image_selected="PushButton_Selected_Press"
-   is_toggle="true"
-   label="Start"
-   label_selected="Stop"
-   layout="topleft"
-   left_pad="10"
-   name="AutoTuneFPS"
-   top_delta="-1"
-   tool_tip="The viewer will attempt to adjust settings to meet the target FPS."
-   width="72">
-  </button>
-  <check_box
-   control_name="AutoTuneLock"
-   follows="top|right"
+ <text
+   follows="left|top"
+   text_color="White"
    height="20"
-   initial_value="true"
-   image_pressed="PushButton_Press"
-   image_pressed_selected="PushButton_Selected_Press"
-   image_selected="PushButton_Selected_Press"
-   is_toggle="true"
-   label="Continuous"
    layout="topleft"
-   left_pad="10"
-   name="AutoTuneContinuous"
-   top_delta="0"
-   tool_tip="The viewer will continually adapt the settings to meet the target FPS until stopped even with the floater closed. When disabled clicking the Start button will adjust for the current settings then stop."
-   width="64">
-  </check_box>
+   name="display_desc"
+   top_delta="5"
+   left_pad="15"
+   wrap="true"
+   width="225">
+  Your display supports up to [FPS_LIMIT] fps.
+  </text>
   <text
    follows="left|top"
    font="SansSerif"
@@ -128,9 +105,9 @@
    layout="topleft"
    left="20"
    name="settings_desc"
-   top_pad="20"
+   top_pad="15"
    wrap="true"
-   width="150">
+   width="115">
     Settings affect
   </text>
   <combo_box
@@ -138,27 +115,118 @@
    font="SansSerif"
    height="20"
    layout="topleft"
-   left_pad="15"
+   left_pad="25"
    control_name="TuningFPSStrategy"
    name="TuningFPSStrategy"
-   width="130">
+   width="160">
     <combo_box.item
      label="Avatars Only"
      name="av_only"
      value="0" />
     <combo_box.item
-     label="Avatars and Scene"
+     label="Avatars and World"
      name="av_and_scene"
      value="1" />
   </combo_box>
+  <button
+   follows="top|left"
+   height="22"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   label="Auto-adjust now"
+   layout="topleft"
+   top_pad="15"
+   left="20"
+   name="start_autotune"
+   tool_tip="The viewer will attempt to adjust settings to meet the target FPS then stop."
+   width="124"/>
+  <button
+   follows="top|left"
+   height="22"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   label="Cancel"
+   layout="topleft"
+   left_pad="15"
+   name="stop_autotune"
+   tool_tip="Stop adjusting settings."
+   width="90"/>
+  <text
+   follows="left|top"
+   text_color="Yellow"
+   height="20"
+   layout="topleft"
+   name="wip_desc"
+   top_delta="5"
+   left_pad="20"
+   wrap="true"
+   width="115">
+  Working on it...
+  </text>
+  <check_box
+   control_name="AutoTuneLock"
+   follows="top|left"
+   height="20"
+   initial_value="true"
+   image_pressed="PushButton_Press"
+   image_pressed_selected="PushButton_Selected_Press"
+   image_selected="PushButton_Selected_Press"
+   is_toggle="true"
+   label="Adjust continuously"
+   layout="topleft"
+   left="17"
+   top_pad="10"
+   name="AutoTuneContinuous"
+   tool_tip="The viewer will continually adapt the settings to meet the target FPS until stopped even with the floater closed."
+   width="64">
+  </check_box>
+  <radio_group
+   control_name="KeepAutoTuneLock"
+   enabled_control="AutoTuneLock"
+   height="50"
+   layout="topleft"
+   follows="top|left"
+   name="autotune_lock_type"
+   top_pad="5"
+   left_delta="15"
+   width="120">
+    <radio_item
+     height="16"
+     label="This login session only"
+     layout="topleft"
+     name="one_session_lock"
+     value="0"
+     width="120" />
+    <radio_item
+     height="16"
+     label="Future login sessions"
+     layout="topleft"
+     name="next_session_lock"
+     value="1"
+     width="120" />
+  </radio_group>
   <view_border
    bevel_style="in"
    height="0"
    layout="topleft"
    name="border_vsync"
-   top_pad="20"
+   top_pad="3"
    left="20"
    width="540"/>
+  <check_box
+   control_name="RenderVSyncEnable"
+   height="16"
+   left="17"
+   initial_value="true"
+   label="Enable VSync"
+   label_text.text_color="White"
+   layout="topleft"
+   top_pad="12"
+   name="vsync"
+   tool_tip="Enable Vertical synchronization to reduce screen tearing and stuttering."
+   width="315" />
   <text
    follows="left|top"
    font="SansSerifSmall"
@@ -166,10 +234,10 @@
    height="18"
    layout="topleft"
    left="20"
-   top_pad="20"
+   top_pad="15"
    name="vsync_desc"
    width="580">
-    Synchronize the refresh rate and frame rate of a monitor,
+    Matches monitor refresh rate with frame rate.
   </text>
   <text
    follows="left|top"
@@ -179,27 +247,16 @@
    layout="topleft"
    top_pad="3"
    left="20"
-   name="vsync_desc2"
+   name="vsync_desc_limit"
    width="580">
-    which can result in smoother performance.
+    Note: Turning on VSync limits frame rate to [FPS_LIMIT] fps.
   </text>
-  <check_box
-   control_name="RenderVSyncEnable"
-   height="16"
-   initial_value="true"
-   label="Enable VSync"
-   label_text.text_color="White"
-   layout="topleft"
-   top_pad="15"
-   name="vsync"
-   tool_tip="Enable Vertical synchronization to reduce screen tearing and stuttering."
-   width="315" />
   <view_border
    bevel_style="in"
    height="0"
    layout="topleft"
    name="border1"
-   top_pad="20"
+   top_pad="10"
    left="20"
    width="540"/>
   <text
@@ -263,7 +320,7 @@
    height="18"
    layout="topleft"
    left="20"
-   top_pad="20"
+   top_pad="15"
    name="dist_limits_desc"
    width="580">
     Choose the distance range that automatic settings will affect.
-- 
cgit v1.2.3


From 0169e8cc976bd261a1d02d248eeed21a3e607201 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 2 Feb 2023 13:43:11 +0200
Subject: SL-19126 Add a button to Graphics Presets fly-out to open Auto adjust
 settings

---
 .../skins/default/xui/en/panel_presets_pulldown.xml       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index b87dda2315..b3d165c4fd 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -8,7 +8,7 @@
  border="false"
  chrome="true"
  follows="bottom"
- height="155"
+ height="185"
  layout="topleft"
  name="presets_pulldown"
  width="225">
@@ -57,7 +57,7 @@
     width="215" />
   <button
     name="open_prefs_btn"
-    label="Open Graphics Preferences"
+    label="Graphics Preferences"
     tool_tip = "Bring up graphics prefs"
     top_delta="5"
     left="15"
@@ -66,4 +66,15 @@
     <button.commit_callback
       function="Presets.GoGraphicsPrefs" />
   </button>
+  <button
+    name="open_autofps_btn"
+    label="Auto-FPS settings"
+    tool_tip = "Bring up auto-adjust settings"
+    top_pad="5"
+    left="15"
+    height="20"
+    width="200">
+    <button.commit_callback
+     function="Presets.GoAutofpsPrefs" />
+  </button>
 </panel>
-- 
cgit v1.2.3


From 788ba76bdf5dcc0a018a6b53bc1cc8f359e85f34 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 2 Feb 2023 16:17:09 +0200
Subject: SL-19094 Move Desired frame rate button to top level

---
 .../skins/default/xui/en/floater_performance.xml   | 95 +++++++++++-----------
 .../xui/en/panel_performance_autoadjustments.xml   | 11 ++-
 2 files changed, 58 insertions(+), 48 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index ee88701037..d1a1119f77 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -4,6 +4,7 @@
  layout="topleft"
  name="performance"
  save_rect="true"
+ reuse_instance="true"
  title="IMPROVE GRAPHICS SPEED"
  width="580">
   <string
@@ -101,10 +102,56 @@
      follows="left|top"
      height="50"
      width="560"
-     name="settings_subpanel"
+     name="autoadjustments_subpanel"
      layout="topleft"
      left="10"
      top="5">
+        <text
+         follows="left|top"
+         font="SansSerifBoldLarge"
+         text_color="White"
+         height="20"
+         layout="topleft"
+         left="10"
+         name="auto_adj_lbl"
+         top="7"
+         width="375">
+         Auto-adjust settings (recommended)
+        </text>
+        <text
+         follows="left|top"
+         font="SansSerif"
+         text_color="White"
+         height="20"
+         layout="topleft"
+         left="10"
+         name="auto_adj_desc"
+         top_pad="0"
+         width="485">
+         Allow automatic adjustments to reach your preferred frame rate.
+        </text>
+        <icon
+         height="16"
+         width="16"
+         image_name="Arrow_Right_Off"
+         mouse_opaque="true"
+         name="icon_arrow4"
+         follows="right|top"
+         top="19"
+         right="-20"/>
+    </panel>
+    <panel
+     bg_alpha_color="PanelGray"
+     background_visible="true"
+     background_opaque="false"
+     border="true"
+     bevel_style="none"
+     follows="left|top"
+     height="50"
+     width="560"
+     name="settings_subpanel"
+     layout="topleft"
+     top_pad="10">
         <text
          follows="left|top"
          font="SansSerifLarge"
@@ -277,52 +324,6 @@
        top="19"
        right="-20"/>
     </panel>
-    <panel
-     bg_alpha_color="PanelGray"
-     background_visible="true"
-     background_opaque="false"
-     border="true"
-     bevel_style="none"
-     follows="left|top"
-     height="50"
-     width="560"
-     name="autoadjustments_subpanel"
-     layout="topleft"
-     top_pad="10">
-      <text
-       follows="left|top"
-       font="SansSerifLarge"
-       text_color="White"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="auto_adj_lbl"
-       top="7"
-       width="175">
-        Preferred frame rate
-      </text>
-      <text
-       follows="left|top"
-       font="SansSerif"
-       text_color="White"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="auto_adj_desc"
-       top_pad="0"
-       width="485">
-        Allow automatic adjustments to reach your preferred frame rate (advanced).
-      </text>
-      <icon
-       height="16"
-       width="16"
-       image_name="Arrow_Right_Off"
-       mouse_opaque="true"
-       name="icon_arrow4"
-       follows="right|top"
-       top="19"
-       right="-20"/>
-    </panel>
   </panel>
   <panel
     filename="panel_performance_nearby.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 24611c94d6..c76d39201d 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -44,8 +44,17 @@
    top_pad="15"
    name="settings_title"
    width="300">
-    Preferred frame rate
+    Auto-adjust settings
   </text>
+  <button
+   follows="top|left"
+   height="23"
+   label="Reset to recommended settings"
+   layout="topleft"
+   left="360"
+   name="defaults_btn"
+   top_delta="0"
+   width="200"/>
   <view_border
    bevel_style="in"
    height="0"
-- 
cgit v1.2.3


From 5b7137f9aa75061fa21ad5def4af8ef673842486 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Sun, 19 Mar 2023 22:07:17 +0200
Subject: SL-19425 add third option to Settings affect: World Only

---
 .../skins/default/xui/en/panel_performance_autoadjustments.xml        | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index c76d39201d..56b032d683 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -136,6 +136,10 @@
      label="Avatars and World"
      name="av_and_scene"
      value="1" />
+	<combo_box.item
+     label="World only"
+     name="scene_only"
+     value="2" />
   </combo_box>
   <button
    follows="top|left"
-- 
cgit v1.2.3


From 561f5f57c297c124950c49fb66e949d641064a97 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 31 Mar 2023 17:05:34 +0300
Subject: SL-19425 capitalization fix

---
 .../newview/skins/default/xui/en/panel_performance_autoadjustments.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 56b032d683..904ce1cc52 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -137,7 +137,7 @@
      name="av_and_scene"
      value="1" />
 	<combo_box.item
-     label="World only"
+     label="World Only"
      name="scene_only"
      value="2" />
   </combo_box>
-- 
cgit v1.2.3


From 82fb4a08ec469cc2c44833d2240564e3f9045d03 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 13 Apr 2023 07:05:05 +0300
Subject: SL-19591 Prompt user to save current settings as Graphics Preset
 before enabling AutoFPS

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 067e5c23c9..f9211600ea 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11965,4 +11965,18 @@ If you want others to see this object, remove it and re-attach it to an avatar a
         yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="EnableAutoFPSWarning"
+   type="alertmodal">
+You are about to enable AutoFPS. All unsaved graphics settings will be lost.
+
+Would you like to save them first?
+      <tag>confirm</tag>
+      <usetemplate
+       name="okcancelbuttons"
+       notext="No"
+       yestext="Yes"/>
+  </notification>
+    
 </notifications>
-- 
cgit v1.2.3