Merged DRTVWR-546 into SL-16329

2 files changed, 14 insertions, 12 deletions

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 3e7459ee8a..0e64d7152a 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -243,7 +243,9 @@ static bool handleAnisotropicChanged(const LLSD& newvalue)
 
 static bool handleVSyncChanged(const LLSD& newvalue)
 {
+#if LL_WINDOWS
     gViewerWindow->getWindow()->toggleVSync(newvalue.asBoolean());
+#endif
     return true;
 }
 
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 cba75e8ea7..4f355cce00 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
@@ -102,6 +102,18 @@
        Low
   </text>
 
+  <check_box
+    control_name="RenderVSyncEnable"
+    height="16"
+    initial_value="true"
+    label="Enable VSync"
+    layout="topleft"
+    left="30"
+    top_delta="16"
+    name="vsync"
+    tool_tip="Synchronizes the frame rate to the refresh rate of the monitor, which results in smooth performance."
+    width="315" />
+
   <text
     type="string"
     length="1"
@@ -334,18 +346,6 @@
     width="256" />
 
   <check_box
-    control_name="RenderVSyncEnable"
-    height="16"
-    initial_value="true"
-    label="Enable VSync"
-    layout="topleft"
-    left="30"
-    top_delta="16"
-    name="vsync"
-    tool_tip="Synchronizes the frame rate to the refresh rate of the monitor, which results in smooth performance."
-    width="315" />
-
-  <check_box
     control_name="RenderCompressTextures"
     height="16"
     initial_value="true"