Fix name of vsync param in LLWindowSDL (#2502)

2 files changed, 8 insertions, 9 deletions

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index e2d9d752ee..89f0d152c6 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -359,11 +359,10 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
                          const std::string& title, S32 x, S32 y, S32 width,
                          S32 height, U32 flags,
                          bool fullscreen, bool clearBg,
-                         bool disable_vsync, bool use_gl,
+                         bool enable_vsync, bool use_gl,
                          bool ignore_pixel_depth, U32 fsaa_samples)
         : LLWindow(callbacks, fullscreen, flags),
         Lock_Display(NULL),
-        //Unlock_Display(NULL), mGamma(1.0f)
         Unlock_Display(NULL), mGamma(1.0f)
 {
     // Initialize the keyboard
@@ -396,7 +395,7 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
         mWindowTitle = title;
 
     // Create the GL context and set it up for windowed or fullscreen, as appropriate.
-    if(createContext(x, y, width, height, 32, fullscreen, disable_vsync))
+    if(createContext(x, y, width, height, 32, fullscreen, enable_vsync))
     {
         gGLManager.initGL();
 
@@ -632,7 +631,7 @@ void LLWindowSDL::tryFindFullscreenSize( int &width, int &height )
     }
 }
 
-bool LLWindowSDL::createContext(int x, int y, int width, int height, int bits, bool fullscreen, bool disable_vsync)
+bool LLWindowSDL::createContext(int x, int y, int width, int height, int bits, bool fullscreen, bool enable_vsync)
 {
     //bool          glneedsinit = false;
 
@@ -892,7 +891,7 @@ bool LLWindowSDL::createContext(int x, int y, int width, int height, int bits, b
 
 
 // changing fullscreen resolution, or switching between windowed and fullscreen mode.
-bool LLWindowSDL::switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync, const LLCoordScreen * const posp)
+bool LLWindowSDL::switchContext(bool fullscreen, const LLCoordScreen &size, bool enable_vsync, const LLCoordScreen * const posp)
 {
     const bool needsRebuild = true;  // Just nuke the context and start over.
     bool result = true;
@@ -902,7 +901,7 @@ bool LLWindowSDL::switchContext(bool fullscreen, const LLCoordScreen &size, bool
     if(needsRebuild)
     {
         destroyContext();
-        result = createContext(0, 0, size.mX, size.mY, 0, fullscreen, disable_vsync);
+        result = createContext(0, 0, size.mX, size.mY, 0, fullscreen, enable_vsync);
         if (result)
         {
             gGLManager.initGL();
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 4b2306da87..10769bb3ba 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -80,7 +80,7 @@ public:
 
     bool setSizeImpl(LLCoordWindow size) override;
 
-    bool switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync,
+    bool switchContext(bool fullscreen, const LLCoordScreen &size, bool enable_vsync,
                                    const LLCoordScreen *const posp = NULL) override;
 
     bool setCursorPosition(LLCoordWindow position) override;
@@ -212,7 +212,7 @@ public:
 protected:
     LLWindowSDL(LLWindowCallbacks *callbacks,
                 const std::string &title, int x, int y, int width, int height, U32 flags,
-                bool fullscreen, bool clearBg, bool disable_vsync, bool use_gl,
+                bool fullscreen, bool clearBg, bool enable_vsync, bool use_gl,
                 bool ignore_pixel_depth, U32 fsaa_samples);
 
     ~LLWindowSDL();
@@ -241,7 +241,7 @@ protected:
     //
 
     // create or re-create the GL context/window.  Called from the constructor and switchContext().
-    bool createContext(int x, int y, int width, int height, int bits, bool fullscreen, bool disable_vsync);
+    bool createContext(int x, int y, int width, int height, int bits, bool fullscreen, bool enable_vsync);
 
     void destroyContext();