Second Life viewer sources 1.19.1.0

1 files changed, 15 insertions, 2 deletions

diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 4ad044b..3f33f1a 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -44,6 +44,7 @@
 
 // Require DirectInput version 8
 #define DIRECTINPUT_VERSION 0x0800
+
 #include <dinput.h>
 
 
@@ -428,7 +429,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
         mhInstance = GetModuleHandle(NULL);
         mWndProc = NULL;
 
-        mSwapMethod = SWAP_METHOD_UNDEFINED;
+        mSwapMethod = SWAP_METHOD_EXCHANGE;
 
         // No WPARAM yet.
         mLastSizeWParam = 0;
@@ -774,7 +775,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
                         attrib_list[cur_attrib++] = GL_TRUE;
 
                         attrib_list[cur_attrib++] = WGL_COLOR_BITS_ARB;
-                        attrib_list[cur_attrib++] = 24;
+                        attrib_list[cur_attrib++] = 32;
 
                         attrib_list[cur_attrib++] = WGL_RED_BITS_ARB;
                         attrib_list[cur_attrib++] = 8;
@@ -1018,6 +1019,11 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
         // based on the system's (or user's) default settings.
         allowLanguageTextInput(NULL, FALSE);
 
+        initInputDevices();
+}
+
+void LLWindowWin32::initInputDevices()
+{
         // Direct Input
         HRESULT hr;
 
@@ -1753,6 +1759,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
         SetWindowLong(mWindowHandle, GWL_USERDATA, (U32)this);
         show();
 
+        initInputDevices();
+
         // ok to post quit messages now
         mPostQuit = TRUE;
         return TRUE;
@@ -1907,6 +1915,9 @@ void LLWindowWin32::initCursors()
         mCursor[UI_CURSOR_TOOLBUY] = loadColorCursor(TEXT("TOOLBUY"));
         mCursor[UI_CURSOR_TOOLPAY] = loadColorCursor(TEXT("TOOLPAY"));
         mCursor[UI_CURSOR_TOOLOPEN] = loadColorCursor(TEXT("TOOLOPEN"));
+        mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
+        mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
+        mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
 
         // Note: custom cursors that are not found make LoadCursor() return NULL.
         for( S32 i = 0; i < UI_CURSOR_COUNT; i++ )
@@ -3196,6 +3207,8 @@ void LLWindowWin32::updateJoystick( )
         mJoyAxis[3] = js.lRx/1000.f;
         mJoyAxis[4] = js.lRy/1000.f;
         mJoyAxis[5] = js.lRz/1000.f;
+        mJoyAxis[6] = js.rglSlider[0]/1000.f;
+        mJoyAxis[7] = js.rglSlider[1]/1000.f;
 
         for (U32 i = 0; i < 16; i++)
         {