Re-introduction of the "smoothie" optimization

This commit replaces the LL optimizations for Macs with Apple gpus by the "Smoothie" optimizations, and replaces the tuning panel with a simple fps limiter panel.
This should fix the crash occurring in extraFPS when the viewer goes in the background.

1 files changed, 26 insertions, 60 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_mp_performance.xml b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
index d943a13f66..1b5cf82dcb 100644
--- a/indra/newview/skins/default/xui/en/floater_mp_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
@@ -3,11 +3,11 @@
  positioning="cascading"
  legacy_header_height="40"
  top="12"
- right="-324"
- height="120"
+ right="-334"
+ height="80"
  min_height="120"
- width="320"
- min_width="320"
+ width="330"
+ min_width="330"
  can_minimize="true"
  can_close="true"
  can_resize="false"
@@ -16,85 +16,51 @@
  single_instance="true"
  save_rect="true"
  save_visibility="true"
- title="Megapahit Tuning">
+ title="FPS Limiter">
 
  <panel
      name="panel_fps"
      border="false"
-     width="300"
-     height="36"
+     width="320"
+     height="60"
      left="10"
      top="40"
-     follows="top|left"
+     follows="left|top|right|bottom"
      layout="topleft"
      >
 
      <slider
-     name="fpsSlider"
-     width="300"
+     follows="left|top"
+     width="240"
      height="15"
+     left="12"
      layout="topleft"
+     name="fpsSlider"
      enabled="true"
      control_name="fpsSlider"
      decimal_digits="0"
-     increment="5"
+     increment="12"
      initial_value="0"
-     label="Max FPS"
+     label="Max FPS:"
      label_width="50"
-     text_width="30"
+     text_width="2"
      can_edit_text="false"
-     show_text="true"
+     show_text="false"
      >
      </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"
+     <text
+     follows="left|top"
+     width="50"
      height="15"
-     left="2"
-     top="8">
-     Optimisations:
-     (needs restart):
-    </text>
-
-    <combo_box
-     control_name="MPVBuffModeControl"
-     name="MPVBuffModeComboBox"
-     width="150"
-     height="23"
-     left="130"
-     top="4"
+     left_delta="252"
+     layout="topleft"
+     type="string"
+     name="fpsText"
      >
-        <combo_box.item
-         enabled="true"
-         label="Normal"
-         name="Normal"
-         value="1" />
-        <combo_box.item
-         enabled="true"
-         label="Apple GPU (smoothie)"
-         name="Megapahit Optimisations"
-         value="2" />
-        <combo_box.item
-         enabled="true"
-         label="Apple GPU (LL)"
-         name="LL Optimisations"
-         value="3" />
-    </combo_box>
+       no limit
+     </text>
 
-    </panel>
+</panel>
 
 </floater>