1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index e581167..05e0564 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -57,6 +57,10 @@ LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
 void LLFloaterJoystick::draw()
 {
         bool joystick_inited = LLViewerJoystick::getInstance()->isJoystickInitialized();
+        if (!joystick_inited)
+        {
+                 joystick_inited = LLViewerJoystick::getInstance()->init(false);
+        }
         childSetEnabled("enable_joystick", joystick_inited);
         childSetEnabled("joystick_type", joystick_inited);
         std::string desc = LLViewerJoystick::getInstance()->getDescription();