From b5ac09bdb43e0f2506d9229e0070c5e8b8792b17 Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Sun, 14 Jul 2024 23:49:59 +0200
Subject: Performance and tuning

Performance and tuning floater updated including fixes
---
 .../default/xui/en/floater_mp_performance.xml      |  99 ++++++++++++++++++++
 .../default/xui/en/floater_mpv_performance.xml     | 104 ---------------------
 .../skins/default/xui/en/panel_status_bar.xml      |   3 +-
 3 files changed, 100 insertions(+), 106 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_mp_performance.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_mpv_performance.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_mp_performance.xml b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
new file mode 100644
index 0000000000..865ffe82cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ positioning="cascading"
+ legacy_header_height="40"
+ top="12"
+ right="-324"
+ height="120"
+ min_height="120"
+ width="320"
+ min_width="320"
+ can_minimize="true"
+ can_close="true"
+ can_resize="false"
+ layout="topright"
+ name="mpv_performance"
+ single_instance="true"
+ save_rect="true"
+ save_visibility="true"
+ title="Megapahit Tuning">
+
+ <panel
+     name="panel_fps"
+     border="false"
+     width="300"
+     height="36"
+     left="10"
+     top="40"
+     follows="top|left"
+     layout="topleft"
+     >
+
+     <slider
+     name="fpsSlider"
+     width="300"
+     height="15"
+     layout="topleft"
+     enabled="true"
+     control_name="fpsSlider"
+     decimal_digits="0"
+     increment="5"
+     initial_value="0"
+     label="Max FPS"
+     label_width="50"
+     text_width="30"
+     can_edit_text="false"
+     show_text="true"
+     >
+     </slider>
+
+    </panel>
+
+    <panel
+     name="panel_mapping"
+     border="false"
+     width="300"
+     height="36"
+     left="10"
+     top="78"
+     follows="top|left"
+     layout="topleft"
+     >
+
+    <text
+     name="MPVBuffModeLabel"
+     width="100"
+     height="15"
+     left="2"
+     top="8">
+     Buffer mapping:
+    </text>
+
+    <combo_box
+     control_name="MPVBuffModeControl"
+     name="MPVBuffModeComboBox"
+     width="150"
+     height="23"
+     left="130"
+     top="4"
+     >
+        <combo_box.item
+         enabled="true"
+         label="Normal"
+         name="Normal"
+         value="1" />
+        <combo_box.item
+         enabled="true"
+         label="Optimized (Apple GPU)"
+         name="Optimized"
+         value="2" />
+        <combo_box.item
+         enabled="true"
+         label="Experimental"
+         name="Experimental"
+         value="3" />
+    </combo_box>
+
+    </panel>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
deleted file mode 100644
index 5c54d366f2..0000000000
--- a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- positioning="cascading"
- legacy_header_height="40"
- top="12"
- right="2"
- height="120"
- min_height="120"
- width="320"
- min_width="320"
- can_minimize="true"
- can_close="true"
- can_resize="false"
- layout="topright"
- name="mpv_performance"
- single_instance="true"
- save_rect="true"
- save_visibility="true"
- title="Megapahit Tuning">
-
- <panel
-     name="panel_fps"
-     border="false"
-     width="300"
-     height="36"
-     left="10"
-     top="40"
-     follows="top|left"
-     layout="topleft"
-     >
-
-     <slider
-     name="fpsSlider"
-     width="300"
-     height="15"
-     layout="topleft"
-     enabled="true"
-     control_name="fpsSlider"
-     decimal_digits="0"
-     increment="5"
-     initial_value="0"
-     label="Max FPS"
-     label_width="50"
-     text_width="30"
-     can_edit_text="false"
-     show_text="true"
-     >
-     </slider>
-
-    </panel>
-
-    <panel
-     name="panel_mapping"
-     border="false"
-     width="300"
-     height="36"
-     left="10"
-     top="78"
-     follows="top|left"
-     layout="topleft"
-     >
-
-    <text
-     name="MPVBuffModeLabel"
-     width="100"
-     height="15"
-     left="2"
-     top="8">
-     Buffer mapping:
-    </text>
-
-    <combo_box
-     control_name="MPVBuffModeControl"
-     name="MPVBuffModeComboBox"
-     width="150"
-     height="23"
-     left="120"
-     top="4"
-     >
-        <combo_box.item
-         enabled="true"
-         label="Auto"
-         name="Auto"
-         value="0" />
-        <combo_box.item
-         enabled="true"
-         label="Normal"
-         name="Normal"
-         value="1" />
-        <combo_box.item
-         enabled="true"
-         label="Optimized (Apple GPU)"
-         name="Optimized"
-         value="2" />
-        <combo_box.item
-         enabled="true"
-         label="Optimized+ (AMD GPU)"
-         name="Optimized+"
-         value="3" />
-    </combo_box>
-
-    </panel>
-
-</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index f337ad9038..80fa230bba 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -188,13 +188,12 @@
      <button
      type="string"
      font="SansSerif"
-     text_color="FpsTextColor"
+     label_color="FpsTextColor"
      follows="right|top"
      halign="center"
      valign="center"
      height="18"
      top="1"
-     v_pad="0"
      left_pad="4"
      name="FpsText"
      tool_tip="fps"
-- 
cgit v1.2.3