diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
| commit | c93c38e047836e31dd34e33391a997d883777ae1 (patch) | |
| tree | ccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/llwindow/llwindowwin32.cpp | |
| parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) | |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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)) |