1 files changed, 9 insertions, 83 deletions

diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 1d084d2..7c3ec01 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -763,8 +764,6 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
         }
 
         SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer
-        mJoyStickState = 0;
-        mJoyButtonState = 0;
 }
 
 
@@ -2815,89 +2814,16 @@ void LLWindowWin32::updateJoystick( )
         if( FAILED( hr = g_pJoystick->GetDeviceState( sizeof(DIJOYSTATE), &js ) ) )
                 return; // The device should have been acquired during the Poll()
 
-        if (js.lX <= -500)
-        {
-                if (!(mJoyStickState & 0x1))
-                {
-                        gKeyboard->handleTranslatedKeyDown(KEY_PAD_LEFT, 0);
-                        mJoyStickState |= 0x1;
-                }
-        }
-        else 
-        {
-                if (mJoyStickState & 0x1)
-                {
-                        gKeyboard->handleTranslatedKeyUp(KEY_PAD_LEFT, 0);
-                        mJoyStickState &= ~0x1;
-                }
-        }
-        if (js.lX >= 500)
-        {
-                if (!(mJoyStickState & 0x2))
-                {
-                        gKeyboard->handleTranslatedKeyDown(KEY_PAD_RIGHT, 0);
-                        mJoyStickState |= 0x2;
-                }
-        }
-        else 
-        {
-                if (mJoyStickState & 0x2)
-                {
-                        gKeyboard->handleTranslatedKeyUp(KEY_PAD_RIGHT, 0);
-                        mJoyStickState &= ~0x2;
-                }
-        }
-        if (js.lY <= -500)
-        {
-                if (!(mJoyStickState & 0x4))
-                {
-                        gKeyboard->handleTranslatedKeyDown(KEY_PAD_UP, 0);
-                        mJoyStickState |= 0x4;
-                }
-        }
-        else 
-        {
-                if (mJoyStickState & 0x4)
-                {
-                        gKeyboard->handleTranslatedKeyUp(KEY_PAD_UP, 0);
-                        mJoyStickState &= ~0x4;
-                }
-        }
-        if (js.lY >=  500)
-        {
-                if (!(mJoyStickState & 0x8))
-                {
-                        gKeyboard->handleTranslatedKeyDown(KEY_PAD_DOWN, 0);
-                        mJoyStickState |= 0x8;
-                }
-        }
-        else 
-        {
-                if (mJoyStickState & 0x8)
-                {
-                        gKeyboard->handleTranslatedKeyUp(KEY_PAD_DOWN, 0);
-                        mJoyStickState &= ~0x8;
-                }
-        }
+        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;
 
-        for( int i = 0; i < 15; i++ )
+        for (U32 i = 0; i < 16; i++)
         {
-                if ( js.rgbButtons[i] & 0x80 )
-                {
-                        if (!(mJoyButtonState & (1<<i)))
-                        {
-                                gKeyboard->handleTranslatedKeyDown(KEY_BUTTON1+i, 0);
-                                mJoyButtonState |= (1<<i);
-                        }
-                }
-                else
-                {
-                        if (mJoyButtonState & (1<<i))
-                        {
-                                gKeyboard->handleTranslatedKeyUp(KEY_BUTTON1+i, 0);
-                                mJoyButtonState &= ~(1<<i);
-                        }
-                }
+                mJoyButtonState[i] = js.rgbButtons[i];
         }
 }