1 files changed, 15 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index 05e0564..960eebb 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -59,7 +59,7 @@ void LLFloaterJoystick::draw()
         bool joystick_inited = LLViewerJoystick::getInstance()->isJoystickInitialized();
         if (!joystick_inited)
         {
-                 joystick_inited = LLViewerJoystick::getInstance()->init(false);
+                 joystick_inited = LLViewerJoystick::getInstance()->init();
         }
         childSetEnabled("enable_joystick", joystick_inited);
         childSetEnabled("joystick_type", joystick_inited);
@@ -147,8 +147,21 @@ void LLFloaterJoystick::refresh()
 {
         LLFloater::refresh();
 
+        bool joystick_inited = LLViewerJoystick::getInstance()->isJoystickInitialized();
+        if (!joystick_inited)
+        {
+                 joystick_inited = LLViewerJoystick::getInstance()->init();
+        }
+
+        mJoystickAutoEnable = gSavedSettings.getBOOL("JoystickAutoEnable");
+        if (mJoystickAutoEnable && joystick_inited)
+        {
+                gSavedSettings.setBOOL("JoystickEnabled",true);
+        }
+
         mJoystickEnabled = gSavedSettings.getBOOL("JoystickEnabled");
 
+
         mJoystickAxis[0] = gSavedSettings.getS32("JoystickAxis0");
         mJoystickAxis[1] = gSavedSettings.getS32("JoystickAxis1");
         mJoystickAxis[2] = gSavedSettings.getS32("JoystickAxis2");
@@ -217,6 +230,7 @@ void LLFloaterJoystick::refresh()
 void LLFloaterJoystick::cancel()
 {
         gSavedSettings.setBOOL("JoystickEnabled", mJoystickEnabled);
+        gSavedSettings.setBOOL("JoystickAutoEnable", mJoystickAutoEnable);
 
         gSavedSettings.setS32("JoystickAxis0", mJoystickAxis[0]);
         gSavedSettings.setS32("JoystickAxis1", mJoystickAxis[1]);