Merge branch 'main' into maint-b

2 files changed, 114 insertions, 10 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
new file mode 100644
index 0000000000..5c54d366f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
@@ -0,0 +1,104 @@
+<?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 dbc181855f..f337ad9038 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -55,11 +55,11 @@
 		 text_pad_left="6"
 		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
 		 top="0">
-			<search_button 
+			<search_button
 			 top_pad="4"
-			 left_pad="4" 
+			 left_pad="4"
 			 width="12"
-			 height="12" 
+			 height="12"
 			 image_unselected="Search"
 			 image_selected="Search"/>
 			<clear_button
@@ -77,20 +77,20 @@
     left="-398"
     width="185"
     top="1"
-    follows="right|top" 
+    follows="right|top"
     name="balance_bg">
     <text
      halign="center"
      font="SansSerifSmall"
      follows="all"
      height="18"
-     left="0" 
+     left="0"
      name="balance"
      tool_tip="Click to refresh your L$ balance"
      v_pad="4"
      top="0"
-     wrap="false" 
-     value="L$??" 
+     wrap="false"
+     value="L$??"
      width="40" />
     <button
      halign="center"
@@ -185,7 +185,7 @@
      top="2"
      name="volume_btn"
      width="16" />
-      <text
+     <button
      type="string"
      font="SansSerif"
      text_color="FpsTextColor"
@@ -195,10 +195,10 @@
      height="18"
      top="1"
      v_pad="0"
-     left_pad="0"
+     left_pad="4"
      name="FpsText"
      tool_tip="fps"
-     width="40">
+     width="32">
      60
      </text>
 </panel>