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

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

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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>
-- 
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/xui/en/floater_performance.xml   | 730 ++++++++++-----------
 1 file changed, 354 insertions(+), 376 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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>
-- 
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

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

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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"
-- 
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/xui/en/floater_performance.xml')

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/xui/en/floater_performance.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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 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

---
 .../skins/default/xui/en/floater_performance.xml   | 217 +++++----------------
 1 file changed, 44 insertions(+), 173 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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"
-- 
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 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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>
-- 
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/xui/en/floater_performance.xml')

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 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

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

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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"
-- 
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/xui/en/floater_performance.xml')

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 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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>
-- 
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 +++++++++++-----------
 1 file changed, 48 insertions(+), 47 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_performance.xml')

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"
-- 
cgit v1.2.3