From 7f0c81918575d3f05e4eadc160b600eaa8b383d1 Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Sat, 30 Aug 2025 01:59:43 +0200
Subject: Performance Optimisations, Bloom effect, Visuals Panel

This commit contains performance optimisations in the the pipeline,
framebuffer, vertexbuffer, reflection probes, shadows. It also fixes
many opengl errors, modifies the opengl debugging, and adds
a visuals effects panel.
---
 .../default/textures/megapahit/fps_button.png      |  Bin 0 -> 195 bytes
 .../default/textures/megapahit/mp_blue_bullet.png  |  Bin 0 -> 654 bytes
 .../default/textures/megapahit/mp_green_bullet.png |  Bin 0 -> 626 bytes
 .../default/textures/megapahit/mp_help_bullet.png  |  Bin 0 -> 704 bytes
 .../default/textures/megapahit/mp_info_bullet.png  |  Bin 0 -> 490 bytes
 .../default/textures/megapahit/mp_red_bullet.png   |  Bin 0 -> 629 bytes
 .../textures/megapahit/mp_yellow_bullet.png        |  Bin 0 -> 648 bytes
 indra/newview/skins/default/textures/textures.xml  |    9 +
 .../newview/skins/default/xui/en/floater_about.xml |    5 +-
 .../default/xui/en/floater_mp_performance.xml      |  115 +-
 .../skins/default/xui/en/floater_preferences.xml   |  368 ++--
 .../en/floater_preferences_graphics_advanced.xml   |   80 +-
 .../xui/en/panel_performance_preferences.xml       |    1 +
 .../default/xui/en/panel_preferences_advanced.xml  |   12 +-
 .../default/xui/en/panel_preferences_colors.xml    |   10 +-
 .../default/xui/en/panel_preferences_graphics3.xml | 1814 ++++++++++++++++++++
 .../skins/default/xui/en/panel_snapshot_local.xml  |    8 +-
 .../skins/default/xui/en/panel_status_bar.xml      |  406 ++---
 18 files changed, 2306 insertions(+), 522 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/megapahit/fps_button.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_green_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_help_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_info_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_red_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml

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

diff --git a/indra/newview/skins/default/textures/megapahit/fps_button.png b/indra/newview/skins/default/textures/megapahit/fps_button.png
new file mode 100644
index 0000000000..fa436a620d
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/fps_button.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png
new file mode 100644
index 0000000000..1a27570786
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png
new file mode 100644
index 0000000000..f4c28e4bc9
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png
new file mode 100644
index 0000000000..64c8933a78
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png
new file mode 100644
index 0000000000..c90767b9ac
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png
new file mode 100644
index 0000000000..aeaa52b53b
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png
new file mode 100644
index 0000000000..026fbaf56d
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1fe1ff333a..8af67c1f88 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -931,4 +931,13 @@ with the same filename but different name
   <texture name="ProgressLarge_11" file_name="icons/ProgressLarge_11.png" preload="true" />
   <texture name="ProgressLarge_12" file_name="icons/ProgressLarge_12.png" preload="true" />
 
+  <texture name="mp_fpsButton" file_name="megapahit/fps_button.png" preload="false" />
+
+  <texture name="mp_red_bullet" file_name="megapahit/mp_red_bullet.png" preload="false" />
+  <texture name="mp_yellow_bullet" file_name="megapahit/mp_yellow_bullet.png" preload="false" />
+  <texture name="mp_green_bullet" file_name="megapahit/mp_green_bullet.png" preload="false" />
+  <texture name="mp_blue_bullet" file_name="megapahit/mp_blue_bullet.png" preload="false" />
+  <texture name="mp_help_bullet" file_name="megapahit/mp_help_bullet.png" preload="false" />
+  <texture name="mp_info_bullet" file_name="megapahit/mp_info_bullet.png" preload="false" />
+
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 0d22d37085..4e7ce2c32f 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -103,8 +103,8 @@ gwigz (nya)                   EmilyAmiee
 Bavid Dailey                  Aria (Tashia Redrose)
 Cate (32a)                    Hiroo Ono
 Melodey                       Keysin (scoutkeysin)
-Yikes Lopez                   Padoria Teuden
-~ ( ^-^ ) ~ (cutie_qu)        Markus Teuden
+Yikes Lopez                   Padoria
+~ ( ^-^ ) ~ (cutie_qu)
     </text_editor>
     <text
           follows="top|left"
@@ -135,7 +135,6 @@ Vir Linden - Making it possible for the project to have a place in SL
 nutsobvious - Early testing and video proof
 Soft Linden - Security testing
 Kyle Linden - Giving TPV parcel 2 to Erik Kundiman
-Signal Linden - Opening opportunities for Megapahit to contribute more
     </text_editor>
     </panel>
   </accordion_tab>
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 1b5cf82dcb..13a32479fa 100644
--- a/indra/newview/skins/default/xui/en/floater_mp_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
@@ -1,65 +1,66 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
- positioning="cascading"
- legacy_header_height="40"
- top="12"
- right="-334"
- height="80"
- min_height="120"
- width="330"
- min_width="330"
- can_minimize="true"
- can_close="true"
- can_resize="false"
- layout="topright"
- name="mpv_performance"
- single_instance="true"
- save_rect="true"
- save_visibility="true"
- title="FPS Limiter">
+positioning="cascading"
+legacy_header_height="40"
+top="12"
+right="-334"
+height="80"
+min_height="120"
+width="330"
+min_width="330"
+can_minimize="true"
+can_close="true"
+can_resize="false"
+layout="topright"
+name="mpv_performance"
+single_instance="true"
+save_rect="true"
+save_visibility="true"
+title="FPS Limiter">
 
- <panel
-     name="panel_fps"
-     border="false"
-     width="320"
-     height="60"
-     left="10"
-     top="40"
-     follows="left|top|right|bottom"
-     layout="topleft"
-     >
+<panel
+    name="panel_fps"
+    border="false"
+    width="320"
+    height="60"
+    left="10"
+    top="40"
+    follows="left|top|right|bottom"
+    layout="topleft"
+    >
 
-     <slider
-     follows="left|top"
-     width="240"
-     height="15"
-     left="12"
-     layout="topleft"
-     name="fpsSlider"
-     enabled="true"
-     control_name="fpsSlider"
-     decimal_digits="0"
-     increment="12"
-     initial_value="0"
-     label="Max FPS:"
-     label_width="50"
-     text_width="2"
-     can_edit_text="false"
-     show_text="false"
-     >
-     </slider>
+    <slider
+    follows="left|top"
+    width="240"
+    height="15"
+    left="12"
+    layout="topleft"
+    name="fpsSliderCtrl"
+    enabled="true"
+    decimal_digits="0"
+    min_val="0"
+    max_val="132"
+    increment="12"
+    initial_value="132"
+    label="Max FPS:"
+    label_width="50"
+    text_width="2"
+    can_edit_text="false"
+    show_text="false"
+    >
+    </slider>
 
-     <text
-     follows="left|top"
-     width="50"
-     height="15"
-     left_delta="252"
-     layout="topleft"
-     type="string"
-     name="fpsText"
-     >
-       no limit
-     </text>
+    <text
+    follows="left|top"
+    width="50"
+    height="15"
+    left_delta="252"
+    layout="topleft"
+    type="string"
+    name="fpsTextCtrl"
+    >
+      no limit
+    </text>
 
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 4b0e0bb221..a96a4f2b75 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -1,175 +1,201 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
- legacy_header_height="18"
- positioning="centered"
- default_tab_group="1"
- height="530"
- layout="topleft"
- name="Preferences"
- help_topic="preferences"
- save_rect="true"
- single_instance="true"
- title="PREFERENCES"
- width="658">
-   <button
-     follows="right|bottom"
-     height="23"
-     label="OK"
-     label_selected="OK"
-     layout="topleft"
-     right="-105"
-     name="OK"
-     top="492"
-     width="90">
-        <button.commit_callback
-         function="Pref.OK" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left_pad="5"
-     name="Cancel"
-     right="-10"
-     width="90" >
-        <button.commit_callback
-         function="Pref.Cancel" />
-    </button>
-
-    <panel
-     name="search_panel"
-     layout="topleft"
-     follows="left|top|right"
-     left="4"
-     right="-4"
-     top="21"
-     height="18"
-     tab_group="2">
-        <search_editor
-         clear_button_visible="true"
-         follows="left|top|right"
-         height="18"
-         label="Search Settings"
-         layout="topleft"
-         left="0"
-         max_length_bytes="255"
-         name="search_prefs_edit"
-         right="-1"
-         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 setting's name or comment."
-         top="0">
-         <search_editor.commit_callback
-          function="UpdateFilter" />
-         <search_editor.clear_button
-          rect.height="18"
-          rect.width="18"
-          rect.bottom="-1" />
-         <search_editor.search_button
-          rect.height="12"
-          rect.width="12"
-          rect.bottom="-1" />
-        </search_editor>
-    </panel>
-
-    <tab_container
-     follows="all"
-     halign="left"
-     height="440"
-     layout="topleft"
-     left="0"
-     name="pref core"
-     tab_group="1"
-     tab_position="left"
-     tab_width="140"
-     tab_padding_right="0"
-     top="40"
-     width="658">
-        <panel
-	 class="panel_preference"
-         filename="panel_preferences_general.xml"
-         label="General"
-         layout="topleft"
-         help_topic="preferences_general_tab"
-         name="general" />
-        <panel
-	 class="panel_preference_graphics"
-         filename="panel_preferences_graphics1.xml"
-         label="Graphics"
-         layout="topleft"
-         help_topic="preferences_display_tab"
-         name="display" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_sound.xml"
-         label="Sound &amp; Media"
-         layout="topleft"
-         help_topic="preferences_audio_tab"
-         name="audio" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_chat.xml"
-         label="Chat"
-         layout="topleft"
-         help_topic="preferences_chat_tab"
-         name="chat" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_move.xml"
-         label="Move &amp; View"
-         layout="topleft"
-         help_topic="preferences_move_tab"
-         name="move" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_alerts.xml"
-         label="Notifications"
-         layout="topleft"
-         help_topic="preferences_msgs_tab"
-         name="msgs" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_colors.xml"
-         label="Colors"
-         layout="topleft"
-         help_topic="preferences_colors_tab"
-         name="colors" />
-        <panel
-         class="panel_preference_privacy"
-         filename="panel_preferences_privacy.xml"
-         label="Privacy"
-         layout="topleft"
-         help_topic="preferences_im_tab"
-         name="im" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_setup.xml"
-         label="Setup"
-         layout="topleft"
-         help_topic="preferences_input_tab"
-         name="input" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_advanced.xml"
-         label="Advanced"
-         layout="topleft"
-         help_topic="preferences_advanced1_tab"
-         name="advanced1" />
-        <panel
-         class="panel_preference"
-         filename="panel_preferences_uploads.xml"
-         label="Uploads"
-         layout="topleft"
-         help_topic="preferences_uploads_tab"
-         name="uploads" />
-        <panel
-         class="panel_preference_controls"
-         filename="panel_preferences_controls.xml"
-         label="Controls"
-         layout="topleft"
-         help_topic="preferences_controls_tab"
-         name="controls" />
-    </tab_container>
+legacy_header_height="18"
+positioning="centered"
+default_tab_group="1"
+height="530"
+layout="topleft"
+name="Preferences"
+help_topic="preferences"
+save_rect="true"
+single_instance="true"
+title="PREFERENCES"
+width="658">
+
+<button
+follows="right|bottom"
+height="23"
+label="OK"
+label_selected="OK"
+layout="topleft"
+right="-105"
+name="OK"
+top="492"
+width="90">
+   <button.commit_callback
+   function="Pref.OK" />
+</button>
+
+<button
+follows="right|bottom"
+height="23"
+label="Cancel"
+label_selected="Cancel"
+layout="topleft"
+left_pad="5"
+name="Cancel"
+right="-10"
+width="90" >
+   <button.commit_callback
+   function="Pref.Cancel" />
+</button>
+
+<panel
+name="search_panel"
+layout="topleft"
+follows="left|top|right"
+left="4"
+right="-4"
+top="21"
+height="18"
+tab_group="2">
+
+   <search_editor
+   clear_button_visible="true"
+   follows="left|top|right"
+   height="18"
+   label="Search Settings"
+   layout="topleft"
+   left="0"
+   max_length_bytes="255"
+   name="search_prefs_edit"
+   right="-1"
+   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 setting's name or comment."
+   top="0">
+
+   <search_editor.commit_callback
+      function="UpdateFilter" />
+
+   <search_editor.clear_button
+      rect.height="18"
+      rect.width="18"
+      rect.bottom="-1" />
+
+   <search_editor.search_button
+      rect.height="12"
+      rect.width="12"
+      rect.bottom="-1" />
+   </search_editor>
+</panel>
+
+<tab_container
+follows="all"
+halign="left"
+height="440"
+layout="topleft"
+left="0"
+name="pref core"
+tab_group="1"
+tab_position="left"
+tab_width="140"
+tab_padding_right="0"
+top="40"
+width="658">
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_general.xml"
+   label="General"
+   layout="topleft"
+   help_topic="preferences_general_tab"
+   name="general" />
+
+   <panel
+   class="panel_preference_graphics"
+   filename="panel_preferences_graphics1.xml"
+   label="Graphics"
+   layout="topleft"
+   help_topic="preferences_display_tab"
+   name="display" />
+
+   <panel
+   class="panel_preference_graphics3"
+   filename="panel_preferences_graphics3.xml"
+   label="Visual Effects"
+   layout="topleft"
+   help_topic="preferences_display_tab"
+   name="display3" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_sound.xml"
+   label="Sound &amp; Media"
+   layout="topleft"
+   help_topic="preferences_audio_tab"
+   name="audio" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_chat.xml"
+   label="Chat"
+   layout="topleft"
+   help_topic="preferences_chat_tab"
+   name="chat" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_move.xml"
+   label="Move &amp; View"
+   layout="topleft"
+   help_topic="preferences_move_tab"
+   name="move" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_alerts.xml"
+   label="Notifications"
+   layout="topleft"
+   help_topic="preferences_msgs_tab"
+   name="msgs" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_colors.xml"
+   label="Colors"
+   layout="topleft"
+   help_topic="preferences_colors_tab"
+   name="colors" />
+
+   <panel
+   class="panel_preference_privacy"
+   filename="panel_preferences_privacy.xml"
+   label="Privacy"
+   layout="topleft"
+   help_topic="preferences_im_tab"
+   name="im" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_setup.xml"
+   label="Setup"
+   layout="topleft"
+   help_topic="preferences_input_tab"
+   name="input" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_advanced.xml"
+   label="Advanced"
+   layout="topleft"
+   help_topic="preferences_advanced1_tab"
+   name="advanced1" />
+
+   <panel
+   class="panel_preference"
+   filename="panel_preferences_uploads.xml"
+   label="Uploads"
+   layout="topleft"
+   help_topic="preferences_uploads_tab"
+   name="uploads" />
+
+   <panel
+   class="panel_preference_controls"
+   filename="panel_preferences_controls.xml"
+   label="Controls"
+   layout="topleft"
+   help_topic="preferences_controls_tab"
+   name="controls" />
+</tab_container>
 
 </floater>
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 88d6ae1bc2..ddb2833b5d 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
@@ -766,88 +766,12 @@
        label="Sun/Moon + Projectors"
        name="2"
        value="2"/>
-  </combo_box>
-
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left="420"
-    name="RenderShadowQualityText"
-    text_readonly_color="LabelDisabledColor"
-    top_delta="22"
-    width="128">
-      Shadows Optimisations
-  </text>
-
-  <combo_box
-   control_name="MPRenderShadowOpti"
-   height="18"
-   layout="topleft"
-   left_delta="130"
-   top_delta="0"
-   name="MPShadowQuality"
-   width="150">
-     <combo_box.item
-       label="No optimisation"
-       name="0"
-       value="0"/>
-     <combo_box.item
-       label="Medium"
-       name="1"
-       value="1"/>
-    <combo_box.item
-       label="Faster"
-       name="2"
-       value="2"/>
-     <combo_box.item
-       label="Fastest"
+      <combo_box.item
+       label="Projectors only"
        name="3"
        value="3"/>
   </combo_box>
 
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left="420"
-    name="RenderShadowResolutionScaleText"
-    text_readonly_color="LabelDisabledColor"
-    top_delta="22"
-    width="128">
-      Shadows Resolution
-  </text>
-
-  <combo_box
-   control_name="RenderShadowResolutionScale"
-   height="18"
-   layout="topleft"
-   left_delta="130"
-   top_delta="0"
-   name="RenderShadowResolutionScale"
-   width="150">
-     <combo_box.item
-       label="Default"
-       name="Default"
-       value="1.0"/>
-     <combo_box.item
-       label="High"
-       name="High"
-       value="1.5"/>
-    <combo_box.item
-       label="Ultra"
-       name="Ultra"
-       value="2.0"/>
-    <combo_box.item
-       label="Crazy"
-       name="Crazy"
-       value="3.0"/>
-  </combo_box>
-
   <check_box
     control_name="RenderScreenSpaceReflections"
     height="16"
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 ece9bb2552..8d4e8dc8e8 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -420,6 +420,7 @@
    width="180">
       (Enter value between 0.0 and 4.0)
   </text>
+
   <text
    follows="left|top"
    font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 8248da9fda..c38af9d4fa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -213,6 +213,7 @@
      layout="topleft"
      left="30"
      name="stream_notification_channel_enabled"
+     top_pad="10"
      width="256">
     </check_box>
     <spinner
@@ -232,15 +233,6 @@
      name="stream_notification_channel"
      top_pad="-15"
      width="170" />
-    <check_box
-     control_name="SnapshotTimestamp"
-     height="16"
-     label="Add timestamp to snapshot file names"
-     layout="topleft"
-     left="30"
-     name="snapshot_timestamp"
-     width="256">
-    </check_box>
 
     <check_box
      control_name="AllowMultipleViewers"
@@ -250,7 +242,7 @@
      layout="topleft"
      left="30"
      name="allow_multiple_viewer_check"
-     top_pad="15"
+     top_pad="20"
      width="237"/>
     <check_box
      control_name="ForceShowGrid"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 6fd6c81217..df9f467fca 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -505,7 +505,6 @@
        Skin
    </text>
    <radio_group
-     control_name="skin_selection"
      height="20"
      layout="topleft"
      left="35"
@@ -538,6 +537,15 @@
          name="radio3"
          value="contrast"
          width="75" />
+        <radio_item
+         label="contrast gold"
+         left_pad="0"
+         layout="topleft"
+         top_delta="0"
+         height="16"
+         name="radio2"
+         value="contrast_gold"
+         width="75" />
         <radio_group.commit_callback
             function="Pref.SelectSkin" />
     </radio_group>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
new file mode 100644
index 0000000000..8b76ece106
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
@@ -0,0 +1,1814 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<panel
+name="Visuals effects panel"
+follows="left|top|right|bottom"
+label="Visuals Effects"
+layout="topleft"
+width="517"
+height="438"
+left="102"
+top="1"
+border="true"
+>
+
+<tab_container
+name="preferences_visuals_tab_container"
+enabled="true"
+top_pad="0"
+follows="left|top"
+width="517"
+height="430"
+left_delta="0"
+tab_position="top"
+tab_stop="false">
+
+<panel
+label="Megapahit"
+name="preferences_visuals_megapahit"
+layout="topleft"
+follows="top|left">
+
+<text
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Megapahit recommended settings:
+</text>
+
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="120"
+top_pad="55"
+font="SansSerifSmall"
+>
+Clicking the button below is a good starting point
+</text>
+
+<button
+name="MPBalancedButton"
+follows="top|left"
+layout="topleft"
+width="200"
+height="23"
+left="155"
+top_pad="40"
+label="Recommended Settings"
+>
+</button>
+
+<text
+follows="left|top"
+layout="topleft"
+width="460"
+height="18"
+left="50"
+top_pad="60"
+font="SansSerifSmall"
+>
+We recommend capping the fps (touch the fps counter on the top right corner)
+</text>
+
+</panel>
+
+<panel
+label="Antialiasing"
+name="preferences_visuals_aa"
+layout="topleft"
+follows="top|left">
+
+<text
+name="mp_aa_lbl"
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="100"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Antialiasing:
+</text>
+
+<text
+name="mp_aa_type_lbl"
+type="string"
+layout="topleft"
+follows="left|top"
+width="140"
+height="16"
+left="32"
+top_pad="10"
+text_readonly_color="LabelDisabledColor"
+>
+Type:
+</text>
+
+<combo_box
+name="mp_aatype_ctrl"
+control_name="RenderFSAAType"
+label="Antialiasing"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+initial_value="0"
+>
+<combo_box.item
+  label="Disabled"
+  name="FSAADisabled"
+  value="0" />
+<combo_box.item
+  label="FXAA"
+  name="FXAA"
+  value="1" />
+<combo_box.item
+  label="SMAA"
+  name="SMAA"
+  value="2" />
+</combo_box>
+
+<icon
+name="mp_aa_bullet"
+tool_tip="Low performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_aa_info_bullet"
+tool_tip="Antialiasing method (FXAA is fast but blurry, SMAA is sharper)."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_aa_quality_lbl"
+tool_tip="Antialiasing quality: We recommend High or Ultra"
+type="string"
+length="1"
+layout="topleft"
+follows="left|top"
+width="140"
+height="16"
+left="32"
+top_pad="10"
+text_readonly_color="LabelDisabledColor"
+>
+Quality:
+</text>
+
+<combo_box
+name="mp_aa_quality_ctrl"
+control_name="RenderFSAASamples"
+label="Antialiasing"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="Low"
+name="Low"
+value="0" />
+<combo_box.item
+label="Medium"
+name="Medium"
+value="1" />
+<combo_box.item
+label="High"
+name="High"
+value="2" />
+<combo_box.item
+label="Ultra"
+name="Ultra"
+value="3" />
+</combo_box>
+
+<icon
+name="mp_aaq_bullet"
+tool_tip="Low performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_aaq_info_bullet"
+tool_tip="Quality of the selected antialiasing"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_cas_lbl"
+type="string"
+length="1"
+layout="topleft"
+follows="left|top"
+width="140"
+height="16"
+left="32"
+top_pad="20"
+text_readonly_color="LabelDisabledColor"
+>
+Sharpness:
+</text>
+
+<slider
+name="mp_cas_ctrl"
+control_name="RenderCASSharpness"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="0"
+initial_value="0.0"
+min_val="0.0"
+max_val="1.0"
+decimal_digits="1"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_cas_bullet"
+tool_tip="No performance impact, except there is an issue currently with the combination of SMAA and Sharpness, where the performance is going down. We are investigating..."
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_cas_info_bullet"
+tool_tip="Add sharpness to the image."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="55"
+top_pad="40"
+font="SansSerifSmall"
+>
+Beware: SMAA + Sharpness currently causes a slow down on Mac.
+</text>
+
+</panel>
+
+<panel
+label="Shadows"
+name="preferences_visuals_shadows"
+layout="topleft"
+follows="top|left">
+
+<text
+name="mp_shadows_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="20"
+top_pad="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Shadows
+</text>
+
+<text
+name="shadow_src_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Shadows source:
+</text>
+
+<combo_box
+name="ShadowDetailCtrl"
+control_name="RenderShadowDetail"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<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.item
+label="Projectors only"
+name="3"
+value="3"/>
+</combo_box>
+
+<icon
+name="mp_shadows_bullet"
+tool_tip="High to extreme performance impact"
+image_name="mp_red_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadows_info_bullet"
+tool_tip="Enables a shadow source (Projectors only is experimental)"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_dist_lbl"
+tool_tip="Maximum Shadow Draw distance (Enormous performance penalty)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall">
+Shadows Distance
+</text>
+
+<slider
+name="MPShadowDistCtrl"
+control_name="MPRenderShadowMaxDist"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="8"
+initial_value="64"
+min_val="16"
+max_val="256"
+decimal_digits="0"
+label_width="2">
+</slider>
+
+<icon
+name="mp_shadowd_bullet"
+tool_tip="Move to the left to improve performance"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadowd_info_bullet"
+tool_tip="Limit the maximum shadow render distance"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_res_lbl"
+tool_tip="Shadow Resolution (Important video memory impact. Lower this if you encounter performance drop, or instability.)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Shadows Resolution
+</text>
+
+<slider
+name="MPShadowResCtrl"
+control_name="RenderShadowResolutionScale"
+decimal_digits="1"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.5"
+initial_value="1.5"
+min_val="1.0"
+max_val="6.0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_shadowdd_bullet"
+tool_tip="Move to the right to improve quality: High memory usage and potentially unstable on lower end gpus"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadowdd_info_bullet"
+tool_tip="Improves the shadow map resolution (Use carefully)"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_res_lbl"
+tool_tip="Shadow smoothness (This will only work if you activate Ambient Occlusion)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Shadows Smoothness
+</text>
+
+<slider
+name="shadowBlurCtrl"
+control_name="RenderShadowBlurSize"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.1"
+initial_value="1.0"
+min_val="0.0"
+max_val="3.0"
+decimal_digits="1"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_shadowsblur_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadowsblur_info_bullet"
+tool_tip="Adjust the shadow smoothness. This only works if SSAO is turned on"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_ssao_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="20"
+top_pad="40"
+font="SansSerifSmall"
+text_color="White"
+>
+Ambient Occlusion
+</text>
+
+<check_box
+name="mp_ssao_ctrl"
+control_name="RenderDeferredSSAO"
+label="Screen Space Ambient Occlusion"
+layout="topleft"
+width="200"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_ssao_bullet"
+tool_tip="Low to Medium performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_ssao_info_bullet"
+tool_tip="Adds some shadow based on surface proximity."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+<panel
+label="Bloom"
+name="preferences_visuals_bloom"
+layout="topleft"
+follows="top|left">
+
+<text
+name="mp_bloom_lbl"
+follows="left|top"
+layout="topleft"
+width="200"
+height="18"
+left="20"
+top_pad="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Bloom (experimental)
+</text>
+
+<text
+name="mp_bloom_level_lbl"
+tool_tip="Bloom Level: The higher, the more diffuse (medium gpu cost)\n Note: This setting can fix a performance issue when antialiasing is turned on)"
+type="string"
+length="1"
+follows="left|top"
+width="140"
+height="16"
+layout="topleft"
+left="32"
+top_pad="10"
+text_readonly_color="LabelDisabledColor"
+>
+Bloom level:
+</text>
+
+<combo_box
+name="MPBloomCtrl"
+control_name="MPRenderBloom"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="None"
+name="0"
+value="0"/>
+<combo_box.item
+label="Level 1"
+name="1"
+value="1"/>
+<combo_box.item
+label="Level 2"
+name="2"
+value="2"/>
+<combo_box.item
+label="Level 3"
+name="3"
+value="3"/>
+</combo_box>
+
+<icon
+name="mp_blooml_bullet"
+tool_tip="Low to Medium performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_blooml_info_bullet"
+tool_tip="Bloom adds a glowing effect around the brightest areas. The level affects the number of iterations, and the quality."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_radius_lbl"
+tool_tip="Bloom Radius"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Radius
+</text>
+
+<slider
+name="MPBloomRadiusCtrl"
+control_name="MPBloomBlurRadius"
+decimal_digits="2"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.01"
+initial_value="1.0"
+label_width="2"
+min_val="0.0"
+max_val="3.0"
+>
+</slider>
+
+<icon
+name="mp_bloomr_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomr_info_bullet"
+tool_tip="Adjust the base radius of the effect"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_radiusadd_lbl"
+tool_tip="Bloom Radius addition"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Radius addition
+</text>
+
+<slider
+name="MPBloomRadiusAddCtrl"
+control_name="MPBloomBlurRadiusAdd"
+decimal_digits="2"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.01"
+initial_value="1.0"
+label_width="2"
+min_val="-3.0"
+max_val="3.0"
+>
+</slider>
+
+<icon
+name="mp_bloomra_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomra_info_bullet"
+tool_tip="Adjust the added radius for each iteration"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_extract_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Range
+</text>
+
+<slider
+name="MPBloomRangeCtrl"
+control_name="MPBloomExtractBrightness"
+decimal_digits="2"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.025"
+initial_value="0.1"
+label_width="2"
+min_val="0.0"
+max_val="0.5"
+>
+</slider>
+
+<icon
+name="mp_bloomrange_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomrange_info_bullet"
+tool_tip="When moved to the right, it will take more of the bright areas."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_strength_lbl"
+tool_tip="Bloom: Strength of the effect (no performance impact)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall">
+Bloom Strength
+</text>
+
+<slider
+name="MPBloomStrCtrl"
+control_name="MPBloomStrength"
+decimal_digits="1"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.1"
+initial_value="1.0"
+min_val="0.5"
+max_val="2.0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_bloomstr_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomstr_info_bullet"
+tool_tip="Controls the effect strength"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_metal_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Metal
+</text>
+
+<slider
+name="MPBloomMetalCtrl"
+control_name="MPBloomExtractMetal"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.05"
+initial_value="0.2"
+decimal_digits="2"
+min_val="0.0"
+max_val="1.0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_bloommetal_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloommetal_info_bullet"
+tool_tip="When moved to the right, the effect will apply on more metallic surfaces."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_nonmetal_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall">
+Bloom Non Metal
+</text>
+
+<slider
+name="MPBloomNonMetalCtrl"
+control_name="MPBloomExtractNonMetal"
+layout="topleft"
+follows="left|top"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.05"
+initial_value="0.2"
+label_width="2"
+decimal_digits="2"
+min_val="0.0"
+max_val="1.0"
+>
+</slider>
+
+<icon
+name="mp_bloomnonmet_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomnonmet_info_bullet"
+tool_tip="When moved to the right, the effect will apply on more non-metallic surfaces."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+<panel
+name="preferences_visuals_probes"
+label="Probes"
+layout="topleft"
+follows="top|left"
+>
+
+<text
+name="mp_probes_lbl"
+follows="left|top"
+layout="topleft"
+width="100"
+height="18"
+left="20"
+top_pad="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Reflection Probes
+</text>
+
+<icon
+name="mp_probedetail_info_bullet"
+tool_tip="Reflection probes are a fundamental part of how pbr lighting is calculated"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_detail_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Reflection Detail:
+</text>
+
+<combo_box
+name="mp_probes_detail_ctrl"
+control_name="RenderReflectionProbeDetail"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="Static Only"
+name="0"
+value="0"/>
+<combo_box.item
+label="Static+Dynamic"
+name="1"
+value="1"/>
+<combo_box.item
+label="Realtime"
+name="2"
+value="2"/>
+</combo_box>
+
+<icon
+name="mp_probedetail_bullet"
+tool_tip="High to extreme performance impact"
+image_name="mp_red_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probedetail_info_bullet"
+tool_tip="Controls how often the reflection probes update with the surrounding. We recommend Static Only for daily usage (specially on Mac)"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_coverage_lbl"
+tool_tip="Reflection probes level (Important memory usage and performance penalty)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Reflection Coverage:
+</text>
+
+<combo_box
+name="probes_level_ctrl"
+control_name="RenderReflectionProbeLevel"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="None"
+name="0"
+value="0"/>
+<combo_box.item
+label="Manual only"
+name="1"
+value="1"/>
+<combo_box.item
+label="Manual + terrain"
+name="2"
+value="2"/>
+<combo_box.item
+label="Full scene"
+name="3"
+value="3"/>
+</combo_box>
+
+<icon
+name="mp_probedetail_bullet"
+tool_tip="Medium to High performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probedetail_info_bullet"
+tool_tip="Controls what part of the surrounding the reflections probes are capturing. We recommend Manual only."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_count_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Max Reflection Probes:
+</text>
+
+<combo_box
+name="mp_probes_count_ctrl"
+control_name="RenderReflectionProbeCount"
+label="Max. Reflection Probes:"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="None"
+name="1"
+value="1"/>
+<combo_box.item
+label="Low"
+name="32"
+value="32"/>
+<combo_box.item
+label="Medium"
+name="64"
+value="64"/>
+<combo_box.item
+label="High"
+name="128"
+value="128"/>
+<combo_box.item
+label="Ultra"
+name="256"
+value="256"/>
+</combo_box>
+
+<icon
+name="mp_probecount_bullet"
+tool_tip="Medium to High performance and memory usage impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probecount_info_bullet"
+tool_tip="Limits the maximum number of active reflections probes"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_res_lbl"
+tool_tip="Sets the resolution used to calculate the probes (Important to extreme video memory impact and performance)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Reflection Resolution:
+</text>
+
+<combo_box
+name="ProbeResCtrl"
+control_name="RenderReflectionProbeResolution"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="Low"
+name="low"
+value="64"/>
+<combo_box.item
+label="Default"
+name="default"
+value="128"/>
+<combo_box.item
+label="High"
+name="high"
+value="256"/>
+<combo_box.item
+label="Maximum"
+name="maximum"
+value="512"/>
+</combo_box>
+
+<icon
+name="mp_proberes_bullet"
+tool_tip="Medium to Extreme performance and memory usage impact"
+image_name="mp_red_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_proberes_info_bullet"
+tool_tip="Improves the quality of the probes"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_dd_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Draw Distance
+</text>
+
+<slider
+control_name="RenderReflectionProbeDrawDistance"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="32"
+min_val="8"
+max_val="64"
+increment="8"
+decimal_digits="0"
+label_width="2">
+</slider>
+
+<icon
+name="mp_probedd_bullet"
+tool_tip="Medium to High performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probedd_info_bullet"
+tool_tip="Controls the draw distance at which the probes are calculating the surrounding"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_ud_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Default Probe Update
+</text>
+
+<slider
+control_name="RenderDefaultProbeUpdatePeriod"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="15"
+increment="1"
+min_val="2"
+max_val="60"
+decimal_digits="0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_dprobeperiod_bullet"
+tool_tip="When moved to the right, the performance will improve."
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_dprobeperiod_info_bullet"
+tool_tip="Controls how the default probe update is delayed."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_ud_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Other Probes delay
+</text>
+
+<slider
+name="MPProbeUpdCtrl"
+control_name="MPRenderProbeUpdatePeriod"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="15"
+increment="1"
+min_val="0"
+max_val="60"
+decimal_digits="0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_probeperiod_bullet"
+tool_tip="When moved to the right, the performance will improve."
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probeperiod_info_bullet"
+tool_tip="Controls how each probe update is delayed."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_slow_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Refresh delay
+</text>
+
+<slider
+name="MPProbeSlowCtrl"
+control_name="MPRenderProbeSlowDown"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="0.01"
+increment="0.01"
+min_val="0"
+max_val="0.2"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+<icon
+name="mp_probeslowdown_bullet"
+tool_tip="When moved to the right, the performance will improve."
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probeslowdown_info_bullet"
+tool_tip="Controls how often the probes update process is called. When moved to the right, the update be slower."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+<panel
+label="Quality"
+name="preferences_visuals_others"
+layout="topleft"
+follows="top|left">
+
+<check_box
+name="VintageCtrl"
+control_name="RenderDisableVintageMode"
+label="HDR and Emissive"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_hdr_bullet"
+tool_tip="Low to Medium performance impact. We recommend it ON, unless you are using a weaker/older computer."
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_hdr_info_bullet"
+tool_tip="Enables Higher color fidelity, and several other post-processing effects."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="mp_transparent_water"
+control_name="RenderTransparentWater"
+label="Transparent Water"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_twater_bullet"
+tool_tip="Low to Medium performance impact. We recommend it ON, unless you are using a weaker/older computer."
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_twater_info_bullet"
+tool_tip="Enables higher quality water with transparency."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="colorPrecisionCtrl"
+control_name="MPLowColorPrecision"
+label="Lower color precision (needs restart)"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_lowcolor_bullet"
+tool_tip="Can help performance specially in high resolution"
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_lowcolor_info_bullet"
+tool_tip="Lowers the internal color precision which can help with performance."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_resdiv_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="30"
+font="SansSerifSmall"
+>
+Resolution divisor
+</text>
+
+<slider
+control_name="RenderResolutionDivisor"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="1.0"
+increment="0.25"
+min_val="1.0"
+max_val="4.0"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+</panel>
+
+<panel
+label="For nerds"
+name="preferences_visuals_others"
+layout="topleft"
+follows="top|left">
+
+<check_box
+name="MultiTexCtrl"
+control_name="RenderGLMultiThreadedTextures"
+label="Multithreaded Textures"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+</check_box>
+
+<icon
+name="mp_multitex_bullet"
+tool_tip="Improves textures loading performance on certain hardware. But can be unstable."
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_multitex_info_bullet"
+tool_tip="Enables loading textures using multiple threads."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="AppleMultGLCtrl"
+control_name="RenderAppleUseMultGL"
+label="Apple Multithreaded OpenGL"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+</check_box>
+
+<icon
+name="mp_applemulti_bullet"
+tool_tip="Variable performance impact. Can be unstable!"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_applemulti_info_bullet"
+tool_tip="Enables Apple OpenGL Multithreaded optimisations. Can be unstable!!"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="NoGLDebugCtrl"
+control_name="MPNoGLDebug"
+label="No GL Debug"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+</check_box>
+
+<icon
+name="mp_nodebug_bullet"
+tool_tip="Leave this always to ON for optimal performance"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_nodebug_info_bullet"
+tool_tip="Ensures there is no opengl debug. This should be set to ON!"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+</tab_container>
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 52f9068264..ae203d68de 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -28,9 +28,9 @@
      top_delta="2">
         Disk
     </text>
-    <view_border 
+    <view_border
      bevel_style="in"
-     follows="left|top|right" 
+     follows="left|top|right"
      height="1"
      left="9"
      layout="topleft"
@@ -74,6 +74,10 @@
          label="1600x1200"
          name="1600x1200"
          value="[i1600,i1200]" />
+         <combo_box.item
+         label="2048x2048"
+         name="2048x2048"
+         value="[i2048,i2048]" />
         <combo_box.item
          label="Custom"
          name="Custom"
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 5e05eb2837..3bf402b7fd 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -1,203 +1,209 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
- background_opaque="true"
- background_visible="true"
- bg_opaque_color="DkGray"
- chrome="true"
- follows="top|right"
- height="19"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="status"
- top="19"
- width="1000">
-    <panel.string
-     name="packet_loss_tooltip">
-        Packet Loss
-    </panel.string>
-    <panel.string
-     name="bandwidth_tooltip">
-        Bandwidth
-    </panel.string>
-    <panel.string
-     name="time">
-        [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
-    </panel.string>
-    <panel.string
-     name="timeTooltip">
-        [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
-    </panel.string>
-	<panel.string
-     name="buycurrencylabel">
-        L$ [AMT]
-    </panel.string>
-  <panel
-	 height="18"
-	 left="-398"
-	 top="0"
-	 width="120"
-	 follows="right|top"
-	 name="menu_search_panel"
-	 background_opaque="true"
-	 background_visible="true"
-	 bg_opaque_color="MouseGray">
-		<search_editor
-		 clear_button_visible="true"
-		 follows="left|top"
-		 height="18"
-		 label="Search Menus"
-		 layout="topleft"
-		 left="0"
-		 max_length_bytes="255"
-		 name="search_menu_edit"
-		 right="-1"
-		 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 
-			 top_pad="4"
-			 left_pad="4" 
-			 width="12"
-			 height="12" 
-			 image_unselected="Search"
-			 image_selected="Search"/>
-			<clear_button
-			 bottom="2"
-			 height="12"
-			 image_unselected="Icon_Close_Foreground"
-			 image_selected="Icon_Close_Press"
-			 pad_right="4"
-			 pad_left="4"
-			 width="12"/>
-		</search_editor>
-  </panel>
-  <panel
-    height="18"
-    left="-398"
-    width="185"
-    top="1"
-    follows="right|top" 
-    name="balance_bg">
-    <text
-     halign="center"
-     font="SansSerifSmall"
-     follows="all"
-     height="18"
-     left="0" 
-     name="balance"
-     tool_tip="Click to refresh your L$ balance"
-     v_pad="4"
-     top="0"
-     wrap="false" 
-     value="L$??" 
-     width="40" />
-    <button
-     halign="center"
-     font="SansSerifSmall"
-     follows="right|top|bottom"
-     image_hover_unselected="PushButton_Over"
-     image_unselected="PushButton_Off"
-     image_pressed="PushButton_Press"
-     height="18"
-     label="Buy L$"
-     label_color="White"
-     left_pad="0"
-     label_shadow="true"
-     name="buyL"
-     pad_right="0"
-     tool_tip="Click to buy more L$"
-     top="0"
-     width="80" />
-    <button
-     halign="left"
-     font="SansSerifSmall"
-     follows="right|top|bottom"
-     imgoverlay_label_space="7"
-     image_overlay="Command_MiniCart_Icon"
-     image_overlay_alignment="left"
-     image_hover_unselected="PushButton_Over"
-     image_unselected="PushButton_Off"
-     image_pressed="PushButton_Press"
-     height="18"
-     label="Shop"
-     label_color="White"
-     left_pad="0"
-     label_shadow="true"
-     name="goShop"
-     tool_tip="Open Second Life Marketplace"
-     top="0"
-     width="65" />
-  </panel>
-    <text
-     type="string"
-     font="SansSerifSmall"
-     text_readonly_color="TimeTextColor"
-     follows="right|top"
-     halign="right"
-     height="16"
-     top="5"
-     layout="topleft"
-     left_pad="0"
-     name="TimeText"
-     tool_tip="Current time (Pacific)"
-     width="85">
-        24:00 AM PST
-    </text>
-    <icon
-     follows="right|top"
-     height="16"
-     image_name="Cam_FreeCam_Off"
-     left_pad="8"
-     top="2"
-     name="presets_icon_camera"
-     width="18" />
-    <icon
-     follows="right|top"
-     height="13"
-     image_name="Presets_Icon"
-     left_pad="8"
-     top="4"
-     name="presets_icon_graphic"
-     width="16" />
-    <button
-     follows="right|top"
-     height="16"
-     image_selected="Play_Off"
-     image_unselected="Pause_Off"
-     image_pressed="Pause_Press"
-     image_pressed_selected="Play_Press"
-     is_toggle="true"
-     left_pad="5"
-     top="1"
-     name="media_toggle_btn"
-     tool_tip="Start/Stop All Media (Music, Video, Web pages)"
-     width="16" >
-    </button>
-    <button
-     follows="right|top"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_pressed="Audio_Press"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     left_pad="5"
-     top="2"
-     name="volume_btn"
-     width="16" />
-     <button
-     type="string"
-     font="SansSerif"
-     label_color="FpsTextColor"
-     follows="right|top"
-     halign="center"
-     valign="center"
-     height="18"
-     top="1"
-     left_pad="4"
-     name="FpsText"
-     tool_tip="fps"
-     width="32">
-     60
-     </button>
+background_opaque="true"
+background_visible="true"
+bg_opaque_color="DkGray"
+chrome="true"
+follows="top|right"
+height="19"
+layout="topleft"
+left="0"
+mouse_opaque="false"
+name="status"
+top="19"
+width="1000">
+   <panel.string
+   name="packet_loss_tooltip">
+      Packet Loss
+   </panel.string>
+   <panel.string
+   name="bandwidth_tooltip">
+      Bandwidth
+   </panel.string>
+   <panel.string
+   name="time">
+      [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+   </panel.string>
+   <panel.string
+   name="timeTooltip">
+      [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+   </panel.string>
+<panel.string
+   name="buycurrencylabel">
+      L$ [AMT]
+   </panel.string>
+<panel
+   height="18"
+   left="-398"
+   top="0"
+   width="120"
+   follows="right|top"
+   name="menu_search_panel"
+   background_opaque="true"
+   background_visible="true"
+   bg_opaque_color="MouseGray">
+   <search_editor
+      clear_button_visible="true"
+      follows="left|top"
+      height="18"
+      label="Search Menus"
+      layout="topleft"
+      left="0"
+      max_length_bytes="255"
+      name="search_menu_edit"
+      right="-1"
+      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
+         top_pad="4"
+         left_pad="4"
+         width="12"
+         height="12"
+         image_unselected="Search"
+         image_selected="Search"/>
+      <clear_button
+         bottom="2"
+         height="12"
+         image_unselected="Icon_Close_Foreground"
+         image_selected="Icon_Close_Press"
+         pad_right="4"
+         pad_left="4"
+         width="12"/>
+   </search_editor>
+</panel>
+<panel
+   height="18"
+   left="-398"
+   width="185"
+   top="1"
+   follows="right|top"
+   name="balance_bg">
+   <text
+   halign="center"
+   font="SansSerifSmall"
+   follows="all"
+   height="18"
+   left="0"
+   name="balance"
+   tool_tip="Click to refresh your L$ balance"
+   v_pad="4"
+   top="0"
+   wrap="false"
+   value="L$??"
+   width="40" />
+   <button
+   halign="center"
+   font="SansSerifSmall"
+   follows="right|top|bottom"
+   image_hover_unselected="PushButton_Over"
+   image_unselected="PushButton_Off"
+   image_pressed="PushButton_Press"
+   height="18"
+   label="Buy L$"
+   label_color="White"
+   left_pad="0"
+   label_shadow="true"
+   name="buyL"
+   pad_right="0"
+   tool_tip="Click to buy more L$"
+   top="0"
+   width="80" />
+   <button
+   halign="left"
+   font="SansSerifSmall"
+   follows="right|top|bottom"
+   imgoverlay_label_space="7"
+   image_overlay="Command_MiniCart_Icon"
+   image_overlay_alignment="left"
+   image_hover_unselected="PushButton_Over"
+   image_unselected="PushButton_Off"
+   image_pressed="PushButton_Press"
+   height="18"
+   label="Shop"
+   label_color="White"
+   left_pad="0"
+   label_shadow="true"
+   name="goShop"
+   tool_tip="Open Second Life Marketplace"
+   top="0"
+   width="65" />
+</panel>
+   <text
+   type="string"
+   font="SansSerifSmall"
+   text_readonly_color="TimeTextColor"
+   follows="right|top"
+   halign="right"
+   height="16"
+   top="5"
+   layout="topleft"
+   left_pad="0"
+   name="TimeText"
+   tool_tip="Current time (Pacific)"
+   width="85">
+      24:00 AM PST
+   </text>
+   <icon
+   follows="right|top"
+   height="16"
+   image_name="Cam_FreeCam_Off"
+   left_pad="8"
+   top="2"
+   name="presets_icon_camera"
+   width="18" />
+   <icon
+   follows="right|top"
+   height="13"
+   image_name="Presets_Icon"
+   left_pad="8"
+   top="4"
+   name="presets_icon_graphic"
+   width="16" />
+   <button
+   follows="right|top"
+   height="16"
+   image_selected="Play_Off"
+   image_unselected="Pause_Off"
+   image_pressed="Pause_Press"
+   image_pressed_selected="Play_Press"
+   is_toggle="true"
+   left_pad="5"
+   top="1"
+   name="media_toggle_btn"
+   tool_tip="Start/Stop All Media (Music, Video, Web pages)"
+   width="16" >
+   </button>
+   <button
+   follows="right|top"
+   height="16"
+   image_selected="AudioMute_Off"
+   image_pressed="Audio_Press"
+   image_unselected="Audio_Off"
+   is_toggle="true"
+   left_pad="5"
+   top="2"
+   name="volume_btn"
+   width="16" />
+   <button
+   type="string"
+   font="SansSerif"
+   image_unselected="mp_fpsButton"
+   image_selected="mp_fpsButton"
+   image_hover_unselected="mp_fpsButton"
+   image_pressed="mp_fpsButton"
+   image_pressed_selected="mp_fpsButton"
+   image_color="White"
+   label_color="FpsTextColor"
+   follows="right|top"
+   halign="center"
+   valign="center"
+   height="18"
+   top="1"
+   left_pad="2"
+   name="FpsText"
+   tool_tip="fps: Color indicates frametime fluctuations (Green is optimal)"
+   width="32">
+   60
+   </button>
 </panel>
-- 
cgit v1.2.3


From ccf0114f36968d6cf6dfb11e1c5a035406314924 Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Mon, 8 Sep 2025 17:26:53 +0200
Subject: Optimisations and experimental HDR display support on mac

This commit completes the previous ones for performance optimisations,
and adds HDR display support on mac
---
 .../default/xui/en/panel_preferences_graphics3.xml | 349 ++++++++++++++++++---
 1 file changed, 299 insertions(+), 50 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
index 8b76ece106..ddc00915a5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
@@ -299,6 +299,71 @@ font="SansSerifSmall"
 Beware: SMAA + Sharpness currently causes a slow down on Mac.
 </text>
 
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="55"
+top_pad="12"
+font="SansSerifSmall"
+>
+Disabling HUDS (Option + Shift + H) fixes the issue.
+</text>
+
+<text
+name="aniso_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="20"
+top_pad="40"
+font="SansSerifSmall"
+text_color="White"
+>
+Texture Filtering
+</text>
+
+<check_box
+name="mp_aniso_ctrl"
+control_name="RenderAnisotropic"
+label="Anisotropic Filtering"
+layout="topleft"
+width="200"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_aniso_bullet"
+tool_tip="Low performance impact on PC/Linux, Medium performance impact on Mac (We are investigating)"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_aniso_info_bullet"
+tool_tip="Improves textures clarity at certain angles (i.e. ground). This should be on, but on Mac there is an abnormal performance penalty, currently."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
 </panel>
 
 <panel
@@ -886,7 +951,7 @@ top_delta="-1"
 increment="0.1"
 initial_value="1.0"
 min_val="0.5"
-max_val="2.0"
+max_val="4.0"
 label_width="2"
 >
 </slider>
@@ -1542,12 +1607,26 @@ name="preferences_visuals_others"
 layout="topleft"
 follows="top|left">
 
+<text
+name="mp_aa_lbl"
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Visual Quality Settings:
+</text>
+
 <check_box
 name="VintageCtrl"
 control_name="RenderDisableVintageMode"
 label="HDR and Emissive"
 layout="topleft"
-width="250"
+width="300"
 height="16"
 left="20"
 top_delta="32"
@@ -1565,7 +1644,7 @@ follows="left|top"
 width="16"
 height="16"
 layout="topleft"
-left_pad="5"
+left_pad="8"
 top_delta="-2"
 />
 
@@ -1586,7 +1665,7 @@ name="mp_transparent_water"
 control_name="RenderTransparentWater"
 label="Transparent Water"
 layout="topleft"
-width="250"
+width="300"
 height="16"
 left="20"
 top_delta="32"
@@ -1604,7 +1683,7 @@ follows="left|top"
 width="16"
 height="16"
 layout="topleft"
-left_pad="5"
+left_pad="8"
 top_delta="-2"
 />
 
@@ -1620,45 +1699,6 @@ left_pad="5"
 top_delta="0"
 />
 
-<check_box
-name="colorPrecisionCtrl"
-control_name="MPLowColorPrecision"
-label="Lower color precision (needs restart)"
-layout="topleft"
-width="250"
-height="16"
-left="20"
-top_delta="32"
-initial_value="false"
->
-<check_box.commit_callback
-function="Pref.RenderOptionUpdate" />
-</check_box>
-
-<icon
-name="mp_lowcolor_bullet"
-tool_tip="Can help performance specially in high resolution"
-image_name="mp_green_bullet"
-follows="left|top"
-width="16"
-height="16"
-layout="topleft"
-left_pad="5"
-top_delta="-2"
-/>
-
-<icon
-name="mp_lowcolor_info_bullet"
-tool_tip="Lowers the internal color precision which can help with performance."
-image_name="mp_info_bullet"
-follows="left|top"
-width="16"
-height="16"
-layout="topleft"
-left_pad="5"
-top_delta="0"
-/>
-
 <text
 name="mp_resdiv_lbl"
 follows="left|top"
@@ -1681,9 +1721,9 @@ height="16"
 left_delta="150"
 top_delta="-1"
 initial_value="1.0"
-increment="0.25"
-min_val="1.0"
-max_val="4.0"
+increment="0.1"
+min_val="0.8"
+max_val="2.0"
 decimal_digits="2"
 label_width="2">
 </slider>
@@ -1696,12 +1736,25 @@ name="preferences_visuals_others"
 layout="topleft"
 follows="top|left">
 
+<text
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Advanced settings:
+</text>
+
 <check_box
 name="MultiTexCtrl"
 control_name="RenderGLMultiThreadedTextures"
 label="Multithreaded Textures"
 layout="topleft"
-width="250"
+width="400"
 height="16"
 left="20"
 top_delta="32"
@@ -1738,7 +1791,7 @@ name="AppleMultGLCtrl"
 control_name="RenderAppleUseMultGL"
 label="Apple Multithreaded OpenGL"
 layout="topleft"
-width="250"
+width="400"
 height="16"
 left="20"
 top_delta="32"
@@ -1770,12 +1823,194 @@ left_pad="5"
 top_delta="0"
 />
 
+<text
+name="color_precision_lbl"
+follows="left|top"
+layout="topleft"
+width="200"
+height="18"
+left="32"
+top_pad="20"
+font="SansSerifSmall"
+>
+Color precision (needs restart):
+</text>
+
+<combo_box
+name="colorPrecisionCtrl"
+control_name="MPColorPrecision"
+layout="topleft"
+width="80"
+height="18"
+left_pad="8"
+top_delta="0"
+>
+<combo_box.item
+label="Low"
+name="low"
+value="1"/>
+<combo_box.item
+label="Default"
+name="default"
+value="0"/>
+<combo_box.item
+label="High"
+name="high"
+value="2"/>
+</combo_box>
+
+<icon
+name="mp_lowcolor_bullet"
+tool_tip="Low setting can help performance specially in high resolution"
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="104"
+top_delta="-2"
+/>
+
+<icon
+name="mp_lowcolor_info_bullet"
+tool_tip="Sets the internal color resolution. Improves the speed or quality."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+follows="left|top"
+layout="topleft"
+top_pad="30"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+HDR Display (Experimental - Mac only):
+</text>
+
+<icon
+name="mp_hdrd_bullet"
+tool_tip="You need an Apple hdr/xdr display"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="20"
+top_pad="12"
+font="SansSerifSmall"
+text_color="White"
+>
+Warning: HDR shows extreme luminosity contrast. Use carefully!
+</text>
+
+<check_box
+name="HDRDisplayCtrl"
+control_name="MPHDRDisplay"
+label="HDR Display (Mac)"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+</check_box>
+
+<text
+name="mp_hdrd_gamma_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="16"
+font="SansSerifSmall"
+>
+Gamma
+</text>
+
+<slider
+control_name="MPHDRGamma"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="2.2"
+increment="0.05"
+min_val="1.8"
+max_val="2.6"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+<text
+name="mp_hdrd_uiboost_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="16"
+font="SansSerifSmall"
+>
+UI Luminosity Boost
+</text>
+
+<slider
+control_name="MPHDRUIBoost"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="1.0"
+increment="0.1"
+min_val="1.0"
+max_val="1.4"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+<text
+follows="left|top"
+layout="topleft"
+top_pad="30"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Developer settings:
+</text>
+
 <check_box
 name="NoGLDebugCtrl"
 control_name="MPNoGLDebug"
 label="No GL Debug"
 layout="topleft"
-width="250"
+width="400"
 height="16"
 left="20"
 top_delta="32"
@@ -1807,8 +2042,22 @@ left_pad="5"
 top_delta="0"
 />
 
+<check_box
+name="MPAppleVBModeCtrl"
+control_name="MPVertexBufferMode"
+label="Megapahit Vertex Buffer Mode (needs restart)"
+layout="topleft"
+width="400"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+</check_box>
+
 </panel>
 
+
 </tab_container>
 
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 317dcdea1ca8d1f540187af47fc23a36ad8232aa Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Sat, 30 Aug 2025 01:59:43 +0200
Subject: Performance Optimisations, Bloom effect, Visuals Panel

This commit contains performance optimisations in the the pipeline,
framebuffer, vertexbuffer, reflection probes, shadows. It also fixes
many opengl errors, modifies the opengl debugging, and adds
a visuals effects panel.
---
 .../default/textures/megapahit/fps_button.png      |  Bin 0 -> 195 bytes
 .../default/textures/megapahit/mp_blue_bullet.png  |  Bin 0 -> 654 bytes
 .../default/textures/megapahit/mp_green_bullet.png |  Bin 0 -> 626 bytes
 .../default/textures/megapahit/mp_help_bullet.png  |  Bin 0 -> 704 bytes
 .../default/textures/megapahit/mp_info_bullet.png  |  Bin 0 -> 490 bytes
 .../default/textures/megapahit/mp_red_bullet.png   |  Bin 0 -> 629 bytes
 .../textures/megapahit/mp_yellow_bullet.png        |  Bin 0 -> 648 bytes
 indra/newview/skins/default/textures/textures.xml  |    9 +
 .../newview/skins/default/xui/en/floater_about.xml |    5 +-
 .../default/xui/en/floater_mp_performance.xml      |  115 +-
 .../skins/default/xui/en/floater_preferences.xml   |    9 +
 .../en/floater_preferences_graphics_advanced.xml   |   92 +-
 .../default/xui/en/panel_preferences_advanced.xml  |    3 +-
 .../default/xui/en/panel_preferences_colors.xml    |   10 +-
 .../default/xui/en/panel_preferences_graphics3.xml | 1814 ++++++++++++++++++++
 .../skins/default/xui/en/panel_snapshot_local.xml  |    4 +
 .../skins/default/xui/en/panel_status_bar.xml      |   10 +-
 17 files changed, 1923 insertions(+), 148 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/megapahit/fps_button.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_green_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_help_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_info_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_red_bullet.png
 create mode 100644 indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml

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

diff --git a/indra/newview/skins/default/textures/megapahit/fps_button.png b/indra/newview/skins/default/textures/megapahit/fps_button.png
new file mode 100644
index 0000000000..fa436a620d
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/fps_button.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png
new file mode 100644
index 0000000000..1a27570786
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png
new file mode 100644
index 0000000000..f4c28e4bc9
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png
new file mode 100644
index 0000000000..64c8933a78
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png
new file mode 100644
index 0000000000..c90767b9ac
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png
new file mode 100644
index 0000000000..aeaa52b53b
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png differ
diff --git a/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png
new file mode 100644
index 0000000000..026fbaf56d
Binary files /dev/null and b/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1fe1ff333a..8af67c1f88 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -931,4 +931,13 @@ with the same filename but different name
   <texture name="ProgressLarge_11" file_name="icons/ProgressLarge_11.png" preload="true" />
   <texture name="ProgressLarge_12" file_name="icons/ProgressLarge_12.png" preload="true" />
 
+  <texture name="mp_fpsButton" file_name="megapahit/fps_button.png" preload="false" />
+
+  <texture name="mp_red_bullet" file_name="megapahit/mp_red_bullet.png" preload="false" />
+  <texture name="mp_yellow_bullet" file_name="megapahit/mp_yellow_bullet.png" preload="false" />
+  <texture name="mp_green_bullet" file_name="megapahit/mp_green_bullet.png" preload="false" />
+  <texture name="mp_blue_bullet" file_name="megapahit/mp_blue_bullet.png" preload="false" />
+  <texture name="mp_help_bullet" file_name="megapahit/mp_help_bullet.png" preload="false" />
+  <texture name="mp_info_bullet" file_name="megapahit/mp_info_bullet.png" preload="false" />
+
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 0d22d37085..4e7ce2c32f 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -103,8 +103,8 @@ gwigz (nya)                   EmilyAmiee
 Bavid Dailey                  Aria (Tashia Redrose)
 Cate (32a)                    Hiroo Ono
 Melodey                       Keysin (scoutkeysin)
-Yikes Lopez                   Padoria Teuden
-~ ( ^-^ ) ~ (cutie_qu)        Markus Teuden
+Yikes Lopez                   Padoria
+~ ( ^-^ ) ~ (cutie_qu)
     </text_editor>
     <text
           follows="top|left"
@@ -135,7 +135,6 @@ Vir Linden - Making it possible for the project to have a place in SL
 nutsobvious - Early testing and video proof
 Soft Linden - Security testing
 Kyle Linden - Giving TPV parcel 2 to Erik Kundiman
-Signal Linden - Opening opportunities for Megapahit to contribute more
     </text_editor>
     </panel>
   </accordion_tab>
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 1b5cf82dcb..13a32479fa 100644
--- a/indra/newview/skins/default/xui/en/floater_mp_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
@@ -1,65 +1,66 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
- positioning="cascading"
- legacy_header_height="40"
- top="12"
- right="-334"
- height="80"
- min_height="120"
- width="330"
- min_width="330"
- can_minimize="true"
- can_close="true"
- can_resize="false"
- layout="topright"
- name="mpv_performance"
- single_instance="true"
- save_rect="true"
- save_visibility="true"
- title="FPS Limiter">
+positioning="cascading"
+legacy_header_height="40"
+top="12"
+right="-334"
+height="80"
+min_height="120"
+width="330"
+min_width="330"
+can_minimize="true"
+can_close="true"
+can_resize="false"
+layout="topright"
+name="mpv_performance"
+single_instance="true"
+save_rect="true"
+save_visibility="true"
+title="FPS Limiter">
 
- <panel
-     name="panel_fps"
-     border="false"
-     width="320"
-     height="60"
-     left="10"
-     top="40"
-     follows="left|top|right|bottom"
-     layout="topleft"
-     >
+<panel
+    name="panel_fps"
+    border="false"
+    width="320"
+    height="60"
+    left="10"
+    top="40"
+    follows="left|top|right|bottom"
+    layout="topleft"
+    >
 
-     <slider
-     follows="left|top"
-     width="240"
-     height="15"
-     left="12"
-     layout="topleft"
-     name="fpsSlider"
-     enabled="true"
-     control_name="fpsSlider"
-     decimal_digits="0"
-     increment="12"
-     initial_value="0"
-     label="Max FPS:"
-     label_width="50"
-     text_width="2"
-     can_edit_text="false"
-     show_text="false"
-     >
-     </slider>
+    <slider
+    follows="left|top"
+    width="240"
+    height="15"
+    left="12"
+    layout="topleft"
+    name="fpsSliderCtrl"
+    enabled="true"
+    decimal_digits="0"
+    min_val="0"
+    max_val="132"
+    increment="12"
+    initial_value="132"
+    label="Max FPS:"
+    label_width="50"
+    text_width="2"
+    can_edit_text="false"
+    show_text="false"
+    >
+    </slider>
 
-     <text
-     follows="left|top"
-     width="50"
-     height="15"
-     left_delta="252"
-     layout="topleft"
-     type="string"
-     name="fpsText"
-     >
-       no limit
-     </text>
+    <text
+    follows="left|top"
+    width="50"
+    height="15"
+    left_delta="252"
+    layout="topleft"
+    type="string"
+    name="fpsTextCtrl"
+    >
+      no limit
+    </text>
 
 </panel>
 
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 4b0e0bb221..97ff1fd5a2 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -100,6 +100,15 @@
          layout="topleft"
          help_topic="preferences_display_tab"
          name="display" />
+
+        <panel
+        class="panel_preference_graphics3"
+         filename="panel_preferences_graphics3.xml"
+         label="Visual Effects"
+         layout="topleft"
+         help_topic="preferences_display_tab"
+         name="display3" />
+
         <panel
 		 class="panel_preference"
          filename="panel_preferences_sound.xml"
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 88d6ae1bc2..8acf870c9d 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
@@ -52,7 +52,7 @@
     left_delta="330"
     width="20">
      m
-  </text>
+  </text> 
   <slider
     control_name="RenderMaxPartCount"
     decimal_digits="0"
@@ -626,9 +626,9 @@
       layout="topleft"
       left="385"
       name="vert_border"
-      top="16"
+      top="16"      
       width="0"/>
-
+  
   <text
     type="string"
     length="1"
@@ -732,7 +732,7 @@
         <check_box.commit_callback
           function="Pref.RenderOptionUpdate" />
     </check_box>
-
+    
   <text
     type="string"
     length="1"
@@ -751,7 +751,7 @@
    height="18"
    layout="topleft"
    left_delta="130"
-   top_delta="0"
+   top_delta="0" 
    name="ShadowDetail"
    width="150">
      <combo_box.item
@@ -766,88 +766,12 @@
        label="Sun/Moon + Projectors"
        name="2"
        value="2"/>
-  </combo_box>
-
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left="420"
-    name="RenderShadowQualityText"
-    text_readonly_color="LabelDisabledColor"
-    top_delta="22"
-    width="128">
-      Shadows Optimisations
-  </text>
-
-  <combo_box
-   control_name="MPRenderShadowOpti"
-   height="18"
-   layout="topleft"
-   left_delta="130"
-   top_delta="0"
-   name="MPShadowQuality"
-   width="150">
-     <combo_box.item
-       label="No optimisation"
-       name="0"
-       value="0"/>
-     <combo_box.item
-       label="Medium"
-       name="1"
-       value="1"/>
-    <combo_box.item
-       label="Faster"
-       name="2"
-       value="2"/>
-     <combo_box.item
-       label="Fastest"
+      <combo_box.item
+       label="Projectors only"
        name="3"
        value="3"/>
   </combo_box>
 
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left="420"
-    name="RenderShadowResolutionScaleText"
-    text_readonly_color="LabelDisabledColor"
-    top_delta="22"
-    width="128">
-      Shadows Resolution
-  </text>
-
-  <combo_box
-   control_name="RenderShadowResolutionScale"
-   height="18"
-   layout="topleft"
-   left_delta="130"
-   top_delta="0"
-   name="RenderShadowResolutionScale"
-   width="150">
-     <combo_box.item
-       label="Default"
-       name="Default"
-       value="1.0"/>
-     <combo_box.item
-       label="High"
-       name="High"
-       value="1.5"/>
-    <combo_box.item
-       label="Ultra"
-       name="Ultra"
-       value="2.0"/>
-    <combo_box.item
-       label="Crazy"
-       name="Crazy"
-       value="3.0"/>
-  </combo_box>
-
   <check_box
     control_name="RenderScreenSpaceReflections"
     height="16"
@@ -861,7 +785,7 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
-
+  
   <text
     type="string"
     length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 8248da9fda..e529ec0db1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -213,6 +213,7 @@
      layout="topleft"
      left="30"
      name="stream_notification_channel_enabled"
+     top_pad="10"
      width="256">
     </check_box>
     <spinner
@@ -250,7 +251,7 @@
      layout="topleft"
      left="30"
      name="allow_multiple_viewer_check"
-     top_pad="15"
+     top_pad="20"
      width="237"/>
     <check_box
      control_name="ForceShowGrid"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 6fd6c81217..df9f467fca 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -505,7 +505,6 @@
        Skin
    </text>
    <radio_group
-     control_name="skin_selection"
      height="20"
      layout="topleft"
      left="35"
@@ -538,6 +537,15 @@
          name="radio3"
          value="contrast"
          width="75" />
+        <radio_item
+         label="contrast gold"
+         left_pad="0"
+         layout="topleft"
+         top_delta="0"
+         height="16"
+         name="radio2"
+         value="contrast_gold"
+         width="75" />
         <radio_group.commit_callback
             function="Pref.SelectSkin" />
     </radio_group>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
new file mode 100644
index 0000000000..8b76ece106
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
@@ -0,0 +1,1814 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+
+<panel
+name="Visuals effects panel"
+follows="left|top|right|bottom"
+label="Visuals Effects"
+layout="topleft"
+width="517"
+height="438"
+left="102"
+top="1"
+border="true"
+>
+
+<tab_container
+name="preferences_visuals_tab_container"
+enabled="true"
+top_pad="0"
+follows="left|top"
+width="517"
+height="430"
+left_delta="0"
+tab_position="top"
+tab_stop="false">
+
+<panel
+label="Megapahit"
+name="preferences_visuals_megapahit"
+layout="topleft"
+follows="top|left">
+
+<text
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Megapahit recommended settings:
+</text>
+
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="120"
+top_pad="55"
+font="SansSerifSmall"
+>
+Clicking the button below is a good starting point
+</text>
+
+<button
+name="MPBalancedButton"
+follows="top|left"
+layout="topleft"
+width="200"
+height="23"
+left="155"
+top_pad="40"
+label="Recommended Settings"
+>
+</button>
+
+<text
+follows="left|top"
+layout="topleft"
+width="460"
+height="18"
+left="50"
+top_pad="60"
+font="SansSerifSmall"
+>
+We recommend capping the fps (touch the fps counter on the top right corner)
+</text>
+
+</panel>
+
+<panel
+label="Antialiasing"
+name="preferences_visuals_aa"
+layout="topleft"
+follows="top|left">
+
+<text
+name="mp_aa_lbl"
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="100"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Antialiasing:
+</text>
+
+<text
+name="mp_aa_type_lbl"
+type="string"
+layout="topleft"
+follows="left|top"
+width="140"
+height="16"
+left="32"
+top_pad="10"
+text_readonly_color="LabelDisabledColor"
+>
+Type:
+</text>
+
+<combo_box
+name="mp_aatype_ctrl"
+control_name="RenderFSAAType"
+label="Antialiasing"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+initial_value="0"
+>
+<combo_box.item
+  label="Disabled"
+  name="FSAADisabled"
+  value="0" />
+<combo_box.item
+  label="FXAA"
+  name="FXAA"
+  value="1" />
+<combo_box.item
+  label="SMAA"
+  name="SMAA"
+  value="2" />
+</combo_box>
+
+<icon
+name="mp_aa_bullet"
+tool_tip="Low performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_aa_info_bullet"
+tool_tip="Antialiasing method (FXAA is fast but blurry, SMAA is sharper)."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_aa_quality_lbl"
+tool_tip="Antialiasing quality: We recommend High or Ultra"
+type="string"
+length="1"
+layout="topleft"
+follows="left|top"
+width="140"
+height="16"
+left="32"
+top_pad="10"
+text_readonly_color="LabelDisabledColor"
+>
+Quality:
+</text>
+
+<combo_box
+name="mp_aa_quality_ctrl"
+control_name="RenderFSAASamples"
+label="Antialiasing"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="Low"
+name="Low"
+value="0" />
+<combo_box.item
+label="Medium"
+name="Medium"
+value="1" />
+<combo_box.item
+label="High"
+name="High"
+value="2" />
+<combo_box.item
+label="Ultra"
+name="Ultra"
+value="3" />
+</combo_box>
+
+<icon
+name="mp_aaq_bullet"
+tool_tip="Low performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_aaq_info_bullet"
+tool_tip="Quality of the selected antialiasing"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_cas_lbl"
+type="string"
+length="1"
+layout="topleft"
+follows="left|top"
+width="140"
+height="16"
+left="32"
+top_pad="20"
+text_readonly_color="LabelDisabledColor"
+>
+Sharpness:
+</text>
+
+<slider
+name="mp_cas_ctrl"
+control_name="RenderCASSharpness"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="0"
+initial_value="0.0"
+min_val="0.0"
+max_val="1.0"
+decimal_digits="1"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_cas_bullet"
+tool_tip="No performance impact, except there is an issue currently with the combination of SMAA and Sharpness, where the performance is going down. We are investigating..."
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_cas_info_bullet"
+tool_tip="Add sharpness to the image."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="55"
+top_pad="40"
+font="SansSerifSmall"
+>
+Beware: SMAA + Sharpness currently causes a slow down on Mac.
+</text>
+
+</panel>
+
+<panel
+label="Shadows"
+name="preferences_visuals_shadows"
+layout="topleft"
+follows="top|left">
+
+<text
+name="mp_shadows_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="20"
+top_pad="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Shadows
+</text>
+
+<text
+name="shadow_src_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Shadows source:
+</text>
+
+<combo_box
+name="ShadowDetailCtrl"
+control_name="RenderShadowDetail"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<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.item
+label="Projectors only"
+name="3"
+value="3"/>
+</combo_box>
+
+<icon
+name="mp_shadows_bullet"
+tool_tip="High to extreme performance impact"
+image_name="mp_red_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadows_info_bullet"
+tool_tip="Enables a shadow source (Projectors only is experimental)"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_dist_lbl"
+tool_tip="Maximum Shadow Draw distance (Enormous performance penalty)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall">
+Shadows Distance
+</text>
+
+<slider
+name="MPShadowDistCtrl"
+control_name="MPRenderShadowMaxDist"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="8"
+initial_value="64"
+min_val="16"
+max_val="256"
+decimal_digits="0"
+label_width="2">
+</slider>
+
+<icon
+name="mp_shadowd_bullet"
+tool_tip="Move to the left to improve performance"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadowd_info_bullet"
+tool_tip="Limit the maximum shadow render distance"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_res_lbl"
+tool_tip="Shadow Resolution (Important video memory impact. Lower this if you encounter performance drop, or instability.)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Shadows Resolution
+</text>
+
+<slider
+name="MPShadowResCtrl"
+control_name="RenderShadowResolutionScale"
+decimal_digits="1"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.5"
+initial_value="1.5"
+min_val="1.0"
+max_val="6.0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_shadowdd_bullet"
+tool_tip="Move to the right to improve quality: High memory usage and potentially unstable on lower end gpus"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadowdd_info_bullet"
+tool_tip="Improves the shadow map resolution (Use carefully)"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_res_lbl"
+tool_tip="Shadow smoothness (This will only work if you activate Ambient Occlusion)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Shadows Smoothness
+</text>
+
+<slider
+name="shadowBlurCtrl"
+control_name="RenderShadowBlurSize"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.1"
+initial_value="1.0"
+min_val="0.0"
+max_val="3.0"
+decimal_digits="1"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_shadowsblur_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_shadowsblur_info_bullet"
+tool_tip="Adjust the shadow smoothness. This only works if SSAO is turned on"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="shadow_ssao_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="20"
+top_pad="40"
+font="SansSerifSmall"
+text_color="White"
+>
+Ambient Occlusion
+</text>
+
+<check_box
+name="mp_ssao_ctrl"
+control_name="RenderDeferredSSAO"
+label="Screen Space Ambient Occlusion"
+layout="topleft"
+width="200"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_ssao_bullet"
+tool_tip="Low to Medium performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_ssao_info_bullet"
+tool_tip="Adds some shadow based on surface proximity."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+<panel
+label="Bloom"
+name="preferences_visuals_bloom"
+layout="topleft"
+follows="top|left">
+
+<text
+name="mp_bloom_lbl"
+follows="left|top"
+layout="topleft"
+width="200"
+height="18"
+left="20"
+top_pad="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Bloom (experimental)
+</text>
+
+<text
+name="mp_bloom_level_lbl"
+tool_tip="Bloom Level: The higher, the more diffuse (medium gpu cost)\n Note: This setting can fix a performance issue when antialiasing is turned on)"
+type="string"
+length="1"
+follows="left|top"
+width="140"
+height="16"
+layout="topleft"
+left="32"
+top_pad="10"
+text_readonly_color="LabelDisabledColor"
+>
+Bloom level:
+</text>
+
+<combo_box
+name="MPBloomCtrl"
+control_name="MPRenderBloom"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="None"
+name="0"
+value="0"/>
+<combo_box.item
+label="Level 1"
+name="1"
+value="1"/>
+<combo_box.item
+label="Level 2"
+name="2"
+value="2"/>
+<combo_box.item
+label="Level 3"
+name="3"
+value="3"/>
+</combo_box>
+
+<icon
+name="mp_blooml_bullet"
+tool_tip="Low to Medium performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_blooml_info_bullet"
+tool_tip="Bloom adds a glowing effect around the brightest areas. The level affects the number of iterations, and the quality."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_radius_lbl"
+tool_tip="Bloom Radius"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Radius
+</text>
+
+<slider
+name="MPBloomRadiusCtrl"
+control_name="MPBloomBlurRadius"
+decimal_digits="2"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.01"
+initial_value="1.0"
+label_width="2"
+min_val="0.0"
+max_val="3.0"
+>
+</slider>
+
+<icon
+name="mp_bloomr_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomr_info_bullet"
+tool_tip="Adjust the base radius of the effect"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_radiusadd_lbl"
+tool_tip="Bloom Radius addition"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Radius addition
+</text>
+
+<slider
+name="MPBloomRadiusAddCtrl"
+control_name="MPBloomBlurRadiusAdd"
+decimal_digits="2"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.01"
+initial_value="1.0"
+label_width="2"
+min_val="-3.0"
+max_val="3.0"
+>
+</slider>
+
+<icon
+name="mp_bloomra_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomra_info_bullet"
+tool_tip="Adjust the added radius for each iteration"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_extract_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Range
+</text>
+
+<slider
+name="MPBloomRangeCtrl"
+control_name="MPBloomExtractBrightness"
+decimal_digits="2"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.025"
+initial_value="0.1"
+label_width="2"
+min_val="0.0"
+max_val="0.5"
+>
+</slider>
+
+<icon
+name="mp_bloomrange_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomrange_info_bullet"
+tool_tip="When moved to the right, it will take more of the bright areas."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_strength_lbl"
+tool_tip="Bloom: Strength of the effect (no performance impact)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall">
+Bloom Strength
+</text>
+
+<slider
+name="MPBloomStrCtrl"
+control_name="MPBloomStrength"
+decimal_digits="1"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.1"
+initial_value="1.0"
+min_val="0.5"
+max_val="2.0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_bloomstr_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomstr_info_bullet"
+tool_tip="Controls the effect strength"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_metal_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Bloom Metal
+</text>
+
+<slider
+name="MPBloomMetalCtrl"
+control_name="MPBloomExtractMetal"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.05"
+initial_value="0.2"
+decimal_digits="2"
+min_val="0.0"
+max_val="1.0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_bloommetal_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloommetal_info_bullet"
+tool_tip="When moved to the right, the effect will apply on more metallic surfaces."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="bloom_nonmetal_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall">
+Bloom Non Metal
+</text>
+
+<slider
+name="MPBloomNonMetalCtrl"
+control_name="MPBloomExtractNonMetal"
+layout="topleft"
+follows="left|top"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+increment="0.05"
+initial_value="0.2"
+label_width="2"
+decimal_digits="2"
+min_val="0.0"
+max_val="1.0"
+>
+</slider>
+
+<icon
+name="mp_bloomnonmet_bullet"
+tool_tip="No performance impact"
+image_name="mp_blue_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_bloomnonmet_info_bullet"
+tool_tip="When moved to the right, the effect will apply on more non-metallic surfaces."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+<panel
+name="preferences_visuals_probes"
+label="Probes"
+layout="topleft"
+follows="top|left"
+>
+
+<text
+name="mp_probes_lbl"
+follows="left|top"
+layout="topleft"
+width="100"
+height="18"
+left="20"
+top_pad="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Reflection Probes
+</text>
+
+<icon
+name="mp_probedetail_info_bullet"
+tool_tip="Reflection probes are a fundamental part of how pbr lighting is calculated"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_detail_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Reflection Detail:
+</text>
+
+<combo_box
+name="mp_probes_detail_ctrl"
+control_name="RenderReflectionProbeDetail"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="Static Only"
+name="0"
+value="0"/>
+<combo_box.item
+label="Static+Dynamic"
+name="1"
+value="1"/>
+<combo_box.item
+label="Realtime"
+name="2"
+value="2"/>
+</combo_box>
+
+<icon
+name="mp_probedetail_bullet"
+tool_tip="High to extreme performance impact"
+image_name="mp_red_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probedetail_info_bullet"
+tool_tip="Controls how often the reflection probes update with the surrounding. We recommend Static Only for daily usage (specially on Mac)"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_coverage_lbl"
+tool_tip="Reflection probes level (Important memory usage and performance penalty)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Reflection Coverage:
+</text>
+
+<combo_box
+name="probes_level_ctrl"
+control_name="RenderReflectionProbeLevel"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="None"
+name="0"
+value="0"/>
+<combo_box.item
+label="Manual only"
+name="1"
+value="1"/>
+<combo_box.item
+label="Manual + terrain"
+name="2"
+value="2"/>
+<combo_box.item
+label="Full scene"
+name="3"
+value="3"/>
+</combo_box>
+
+<icon
+name="mp_probedetail_bullet"
+tool_tip="Medium to High performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probedetail_info_bullet"
+tool_tip="Controls what part of the surrounding the reflections probes are capturing. We recommend Manual only."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_count_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Max Reflection Probes:
+</text>
+
+<combo_box
+name="mp_probes_count_ctrl"
+control_name="RenderReflectionProbeCount"
+label="Max. Reflection Probes:"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="None"
+name="1"
+value="1"/>
+<combo_box.item
+label="Low"
+name="32"
+value="32"/>
+<combo_box.item
+label="Medium"
+name="64"
+value="64"/>
+<combo_box.item
+label="High"
+name="128"
+value="128"/>
+<combo_box.item
+label="Ultra"
+name="256"
+value="256"/>
+</combo_box>
+
+<icon
+name="mp_probecount_bullet"
+tool_tip="Medium to High performance and memory usage impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probecount_info_bullet"
+tool_tip="Limits the maximum number of active reflections probes"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="probes_res_lbl"
+tool_tip="Sets the resolution used to calculate the probes (Important to extreme video memory impact and performance)"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Reflection Resolution:
+</text>
+
+<combo_box
+name="ProbeResCtrl"
+control_name="RenderReflectionProbeResolution"
+layout="topleft"
+width="150"
+height="18"
+left_delta="150"
+top_delta="0"
+>
+<combo_box.item
+label="Low"
+name="low"
+value="64"/>
+<combo_box.item
+label="Default"
+name="default"
+value="128"/>
+<combo_box.item
+label="High"
+name="high"
+value="256"/>
+<combo_box.item
+label="Maximum"
+name="maximum"
+value="512"/>
+</combo_box>
+
+<icon
+name="mp_proberes_bullet"
+tool_tip="Medium to Extreme performance and memory usage impact"
+image_name="mp_red_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="55"
+top_delta="-2"
+/>
+
+<icon
+name="mp_proberes_info_bullet"
+tool_tip="Improves the quality of the probes"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_dd_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Draw Distance
+</text>
+
+<slider
+control_name="RenderReflectionProbeDrawDistance"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="32"
+min_val="8"
+max_val="64"
+increment="8"
+decimal_digits="0"
+label_width="2">
+</slider>
+
+<icon
+name="mp_probedd_bullet"
+tool_tip="Medium to High performance impact"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probedd_info_bullet"
+tool_tip="Controls the draw distance at which the probes are calculating the surrounding"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_ud_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Default Probe Update
+</text>
+
+<slider
+control_name="RenderDefaultProbeUpdatePeriod"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="15"
+increment="1"
+min_val="2"
+max_val="60"
+decimal_digits="0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_dprobeperiod_bullet"
+tool_tip="When moved to the right, the performance will improve."
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_dprobeperiod_info_bullet"
+tool_tip="Controls how the default probe update is delayed."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_ud_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Other Probes delay
+</text>
+
+<slider
+name="MPProbeUpdCtrl"
+control_name="MPRenderProbeUpdatePeriod"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="15"
+increment="1"
+min_val="0"
+max_val="60"
+decimal_digits="0"
+label_width="2"
+>
+</slider>
+
+<icon
+name="mp_probeperiod_bullet"
+tool_tip="When moved to the right, the performance will improve."
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probeperiod_info_bullet"
+tool_tip="Controls how each probe update is delayed."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_probe_slow_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="10"
+font="SansSerifSmall"
+>
+Refresh delay
+</text>
+
+<slider
+name="MPProbeSlowCtrl"
+control_name="MPRenderProbeSlowDown"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="0.01"
+increment="0.01"
+min_val="0"
+max_val="0.2"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+<icon
+name="mp_probeslowdown_bullet"
+tool_tip="When moved to the right, the performance will improve."
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_probeslowdown_info_bullet"
+tool_tip="Controls how often the probes update process is called. When moved to the right, the update be slower."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+<panel
+label="Quality"
+name="preferences_visuals_others"
+layout="topleft"
+follows="top|left">
+
+<check_box
+name="VintageCtrl"
+control_name="RenderDisableVintageMode"
+label="HDR and Emissive"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_hdr_bullet"
+tool_tip="Low to Medium performance impact. We recommend it ON, unless you are using a weaker/older computer."
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_hdr_info_bullet"
+tool_tip="Enables Higher color fidelity, and several other post-processing effects."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="mp_transparent_water"
+control_name="RenderTransparentWater"
+label="Transparent Water"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_twater_bullet"
+tool_tip="Low to Medium performance impact. We recommend it ON, unless you are using a weaker/older computer."
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_twater_info_bullet"
+tool_tip="Enables higher quality water with transparency."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="colorPrecisionCtrl"
+control_name="MPLowColorPrecision"
+label="Lower color precision (needs restart)"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_lowcolor_bullet"
+tool_tip="Can help performance specially in high resolution"
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_lowcolor_info_bullet"
+tool_tip="Lowers the internal color precision which can help with performance."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+name="mp_resdiv_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="30"
+font="SansSerifSmall"
+>
+Resolution divisor
+</text>
+
+<slider
+control_name="RenderResolutionDivisor"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="1.0"
+increment="0.25"
+min_val="1.0"
+max_val="4.0"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+</panel>
+
+<panel
+label="For nerds"
+name="preferences_visuals_others"
+layout="topleft"
+follows="top|left">
+
+<check_box
+name="MultiTexCtrl"
+control_name="RenderGLMultiThreadedTextures"
+label="Multithreaded Textures"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+</check_box>
+
+<icon
+name="mp_multitex_bullet"
+tool_tip="Improves textures loading performance on certain hardware. But can be unstable."
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_multitex_info_bullet"
+tool_tip="Enables loading textures using multiple threads."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="AppleMultGLCtrl"
+control_name="RenderAppleUseMultGL"
+label="Apple Multithreaded OpenGL"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+</check_box>
+
+<icon
+name="mp_applemulti_bullet"
+tool_tip="Variable performance impact. Can be unstable!"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_applemulti_info_bullet"
+tool_tip="Enables Apple OpenGL Multithreaded optimisations. Can be unstable!!"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<check_box
+name="NoGLDebugCtrl"
+control_name="MPNoGLDebug"
+label="No GL Debug"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+</check_box>
+
+<icon
+name="mp_nodebug_bullet"
+tool_tip="Leave this always to ON for optimal performance"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_nodebug_info_bullet"
+tool_tip="Ensures there is no opengl debug. This should be set to ON!"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+</panel>
+
+</tab_container>
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 52f9068264..fb88b752ae 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -74,6 +74,10 @@
          label="1600x1200"
          name="1600x1200"
          value="[i1600,i1200]" />
+         <combo_box.item
+         label="2048x2048"
+         name="2048x2048"
+         value="[i2048,i2048]" />
         <combo_box.item
          label="Custom"
          name="Custom"
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 5e05eb2837..dbdec5b5ef 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -188,15 +188,21 @@
      <button
      type="string"
      font="SansSerif"
+     image_unselected="mp_fpsButton"
+     image_selected="mp_fpsButton"
+     image_hover_unselected="mp_fpsButton"
+     image_pressed="mp_fpsButton"
+     image_pressed_selected="mp_fpsButton"
+     image_color="White"
      label_color="FpsTextColor"
      follows="right|top"
      halign="center"
      valign="center"
      height="18"
      top="1"
-     left_pad="4"
+     left_pad="2"
      name="FpsText"
-     tool_tip="fps"
+     tool_tip="fps: Color indicates frametime fluctuations (Green is optimal)"
      width="32">
      60
      </button>
-- 
cgit v1.2.3