From c93c38e047836e31dd34e33391a997d883777ae1 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 21 Mar 2007 19:36:11 +0000
Subject: svn merge -r 59178:59364
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/llwindow/llwindowwin32.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/llwindow/llwindowwin32.cpp')

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 4efa173fc4..b8123096e6 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -2796,6 +2796,13 @@ void LLWindowWin32::updateJoystick( )
 	if( FAILED( hr = g_pJoystick->GetDeviceState( sizeof(DIJOYSTATE), &js ) ) )
 		return; // The device should have been acquired during the Poll()
 
+	mJoyAxis[0] = js.lX/1000.f;
+	mJoyAxis[1] = js.lY/1000.f;
+	mJoyAxis[2] = js.lZ/1000.f;
+	mJoyAxis[3] = js.lRx/1000.f;
+	mJoyAxis[4] = js.lRy/1000.f;
+	mJoyAxis[5] = js.lRz/1000.f;
+
 	if (js.lX <= -500)
 	{
 		if (!(mJoyStickState & 0x1))
-- 
cgit v1.3