From 1bbbaf8dd69a08a3e7c570e6ad14f57a4f6e91cb Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Fri, 18 Jan 2013 13:16:12 -0500
Subject: Partial workaround for mouse delta issue.

---
 indra/llwindow/llwindowmacosx.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 93b9f4c484..95ad87d58f 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -285,8 +285,9 @@ void callMouseMoved(float *pos, MASK mask)
 	gWindowImplementation->getMouseDeltas(deltas);
 	outCoords.mX += deltas[0];
 	outCoords.mY += deltas[1];
+	LL_INFOS("Mouse Movement") << "Moved coords: " << outCoords.mX << ", " << outCoords.mY << LL_ENDL;
 	gWindowImplementation->getCallbacks()->handleMouseMove(gWindowImplementation, outCoords, gKeyboard->currentMask(TRUE));
-	
+	gWindowImplementation->getCallbacks()->handleScrollWheel(gWindowImplementation, 0);
 }
 
 void callScrollMoved(float delta)
@@ -343,7 +344,7 @@ void LLWindowMacOSX::updateMouseDeltas(float* deltas)
 	if (mCursorDecoupled)
 	{
 		mCursorLastEventDeltaX = llround(deltas[0]);
-		mCursorLastEventDeltaY = llround(deltas[1]);
+		mCursorLastEventDeltaY = llround(-deltas[1]);
 		
 		if (mCursorIgnoreNextDelta)
 		{
@@ -351,7 +352,6 @@ void LLWindowMacOSX::updateMouseDeltas(float* deltas)
 			mCursorLastEventDeltaY = 0;
 			mCursorIgnoreNextDelta = FALSE;
 		}
-		LL_INFOS("Delta Update") << "Last event delta: " << mCursorLastEventDeltaX << ", " << mCursorLastEventDeltaY << LL_ENDL;
 	} else {
 		mCursorLastEventDeltaX = 0;
 		mCursorLastEventDeltaY = 0;
@@ -738,7 +738,7 @@ void LLWindowMacOSX::swapBuffers()
 
 F32 LLWindowMacOSX::getGamma()
 {
-	F32 result = 1.8;	// Default to something sane
+	F32 result = 2.2;	// Default to something sane
 
 	CGGammaValue redMin;
 	CGGammaValue redMax;
-- 
cgit v1.2.3