Merge branch 'main' into 2025.06

1 files changed, 243 insertions, 7 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ab236f2fba..503f2760a8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8569,7 +8569,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>1.4</real>
+    <real>1.0</real>
   </map>
   <key>RenderShadowBlurSamples</key>
   <map>
@@ -9348,9 +9348,9 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>U32</string>
+    <string>F32</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>1.0</integer>
   </map>
   <key>RenderShaderLightingMaxLevel</key>
   <map>
@@ -14385,7 +14385,133 @@
 
 
     <!-- megapahit settings -->
-    <key>MPVBufferOptiMode</key>
+
+    <key>MPVertexBufferMode</key>
+    <map>
+      <key>Comment</key>
+      <string>Vertex Buffer Mode for Mac (0=LL, 1=MP)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>MPHDRDisplay</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable / Disable HDR Display Support (Mac)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>MPHDRBoost</key>
+    <map>
+      <key>Comment</key>
+      <string>HDR Boost</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <integer>1.5</integer>
+    </map>
+    <key>MPHDRGamma</key>
+    <map>
+      <key>Comment</key>
+      <string>HDR Gamma</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <integer>2.4</integer>
+    </map>
+    <key>MPHDRUIBoost</key>
+    <map>
+      <key>Comment</key>
+      <string>HDR UI Boost</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <integer>1.5</integer>
+    </map>
+    <key>MPColorPrecision</key>
+    <map>
+      <key>Comment</key>
+      <string>Color buffers precision</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>MPNoGLDebug</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable / Disable GL Debug</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>MPGamma</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable / Disable Gamma</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>MPTone</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable / Disable Tonemap</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>MPGlow</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable / Disable Glow</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>MPLuminanceMipmap</key>
+    <map>
+      <key>Comment</key>
+      <string>
+      Luminance Map Mipmaps:
+      (set to 0 to fix post-processing slowdowns)
+      0:no
+      1:yes
+      </string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <map>
       <key>Comment</key>
       <string>
@@ -14401,17 +14527,127 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>MPRenderShadowOpti</key>
+    <key>MPRenderShadowMaxDist</key>
     <map>
       <key>Comment</key>
-      <string>Shadows Optimisations</string>
+      <string>Shadows Max Draw distance</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>S32</string>
+      <string>F32</string>
+      <key>Value</key>
+      <integer>64</integer>
+    </map>
+    <key>MPRenderBloom</key>
+    <map>
+      <key>Comment</key>
+      <string>Automatic bloom (n blur iterations, 0: Disable)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>MPBloomExtractBrightness</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto bloom: Min extracted brightness</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.20</real>
+    </map>
+    <key>MPBloomExtractMetal</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto bloom: Metal roughness limit filter</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.40</real>
+    </map>
+    <key>MPBloomExtractNonMetal</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto bloom: Non Metal roughness limit filter</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.0</real>
+    </map>
+    <key>MPBloomStrength</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto bloom Strength (0.1 to 1.5)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
+    <key>MPBloomBlurRadius</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto bloom: Radius</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.5</real>
+    </map>
+    <key>MPBloomBlurRadiusAdd</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto bloom: Radius add</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.9</real>
+    </map>
+    <key>MPRenderProbeUpdatePeriod</key>
+    <map>
+      <key>Comment</key>
+      <string>Delay between probes updates</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>15.0</real>
+    </map>
+    <key>MPRenderProbeSlowDown</key>
+    <map>
+      <key>Comment</key>
+      <string>Slow down probes updates</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.05</real>
+    </map>
+    <key>MPRenderProbeProgressive</key>
+    <map>
+      <key>Comment</key>
+      <string>Calculate Radiance progressively</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>MPVCameraCollapsed</key>
     <map>
       <key>Comment</key>