From 162e7b76993b727bbe0d822c4902f54fe72f0f61 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 8 May 2014 15:30:02 -0500
Subject: [PATCH] Fixed a silly mistake that was causing vsync to be enabled
 when it should have been. Also fix typo in objectSkinV.glsl previous commit

---
 indra/llwindow/llwindowwin32.cpp                       | 10 +++++-----
 .../shaders/class1/avatar/objectSkinV.glsl             |  2 +-
 indra/newview/llviewerwindow.cpp                       |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 8e6b4c57c..6b8a1a45b 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -635,7 +635,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
 	LLCoordScreen windowPos(x,y);
 	LLCoordScreen windowSize(window_rect.right - window_rect.left,
 							 window_rect.bottom - window_rect.top);
-	if (!switchContext(mFullscreen, windowSize, TRUE, &windowPos))
+	if (!switchContext(mFullscreen, windowSize, vsync_mode, &windowPos))
 	{
 		return;
 	}
@@ -1654,21 +1654,21 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, co
 	{
 		if (vsync_mode == 0)
 		{
-			LL_DEBUGS("Window") << "Disabling vertical sync" << LL_ENDL;
+			LL_INFOS("Window") << "Disabling vertical sync" << LL_ENDL;
 			wglSwapIntervalEXT(0);
 		}
 		else if(vsync_mode == -1)
 		{
-			LL_DEBUGS("Window") << "Enabling adaptive vertical sync" << LL_ENDL;
+			LL_INFOS("Window") << "Enabling adaptive vertical sync" << LL_ENDL;
 			if(wglSwapIntervalEXT(-1) == 0)
 			{
-				LL_DEBUGS("Window") << "Failed to enable adaptive vertical sync. Disabling vsync." << LL_ENDL;
+				LL_INFOS("Window") << "Failed to enable adaptive vertical sync. Disabling vsync." << LL_ENDL;
 				wglSwapIntervalEXT(0);
 			}
 		}
 		else
 		{
-			LL_DEBUGS("Window") << "Enabling vertical sync" << LL_ENDL;
+			LL_INFOS("Window") << "Enabling vertical sync" << LL_ENDL;
 			wglSwapIntervalEXT(1);
 		}
 	}
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index aa445fd14..f4e86409c 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -65,7 +65,7 @@ mat4 getObjectSkinnedTransform()
 	ret[0] = vec4(mat[0].xyz, 0);
 	ret[1] = vec4(mat[1].xyz, 0);
 	ret[2] = vec4(mat[2].xyz, 0);
-	ret[3] = vec4(trans, scale);
+	ret[3] = vec4(trans, sum);
 				
 	return ret;
 }
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 1e77f7b43..37ac057dd 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5512,7 +5512,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
 			mWindow->setSize(size);
 		}
 
-		if (fsaa == old_fsaa && vsync_mode == mWindow->getFSAASamples())
+		if (fsaa == old_fsaa && vsync_mode == mWindow->getVsyncMode())
 		{
 			return TRUE;
 		}