2 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index e8ee2a1..ef05fae 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4068,7 +4068,7 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
 {
         if (LLViewerJoystick::getInstance()->getOverrideCamera())
         {
-                return;
+                LLViewerJoystick::getInstance()->setOverrideCamera(false);
         }
 
         // visibility changes at end of animation
@@ -4131,7 +4131,7 @@ void LLAgent::changeCameraToDefault()
 {
         if (LLViewerJoystick::getInstance()->getOverrideCamera())
         {
-                return;
+                LLViewerJoystick::getInstance()->setOverrideCamera(false);
         }
 
         if (LLFollowCamMgr::getActiveFollowCamParams())
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp
index 652e50e..d955a80 100644
--- a/linden/indra/newview/llviewerjoystick.cpp
+++ b/linden/indra/newview/llviewerjoystick.cpp
@@ -264,6 +264,8 @@ void LLViewerJoystick::init(bool autoenable)
                         // It's not a Space Navigator
                         gSavedSettings.setString("JoystickInitialized", "UnknownDevice");
                 }
+
+                gSavedSettings.setBOOL("JoystickEnabled", TRUE );
         }
         else
         {