Merge branch 'main' into maint-b

1 files changed, 0 insertions, 16 deletions

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 83f5e16977..eb689dc48c 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -38,10 +38,6 @@
 #include "lldir.h"
 #include "llfindlocale.h"
 
-#include "../newview/llviewercontrol.h"
-
-extern LLControlGroup gSavedSettings;
-
 #ifdef LL_GLIB
 #include <glib.h>
 #endif
@@ -1259,18 +1255,6 @@ void LLWindowSDL::swapBuffers()
     if (mWindow)
     {
         SDL_GL_SwapWindow( mWindow );
-        U32 mode = gSavedSettings.getU32("MPVBufferOptiMode");
-        if (mode == 0)
-        {
-            if(gGLManager.mIsApple) mode = 2;
-            else mode = 1;
-        }
-        if (mode > 2)
-        {
-            glClientWaitSync(swapFense, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
-            glDeleteSync(swapFense);
-            swapFense = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-        }
     }
 }