Merge branch 'main' into webrtc-voice

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 9207e6ad73..cb54785e76 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -50,6 +50,11 @@
 #include "llglheaders.h"
 #include "llglslshader.h"
 
+#include "llvertexbuffer.h"
+#include "llcontrol.h"
+extern LLControlGroup gSavedSettings;
+
+
 #if LL_WINDOWS
 #include "lldxhardware.h"
 #endif
@@ -1263,6 +1268,15 @@ bool LLGLManager::initGL()
 
     initGLStates();
 
+    U32 MPVBufferOptiMode = gSavedSettings.getU32("MPVBufferOptiMode");
+    if (MPVBufferOptiMode == 0)
+    {
+        if(mIsApple) MPVBufferOptiMode = 2;
+        else MPVBufferOptiMode = 1;
+        gSavedSettings.setU32("MPVBufferOptiMode",MPVBufferOptiMode);
+    }
+    LLVertexBuffer::sMappingMode = MPVBufferOptiMode;
+
     return true;
 }