1 files changed, 20 insertions, 10 deletions
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
index 558b14bba7..d3add020cf 100644
--- a/indra/newview/llfloaterjoystick.cpp
+++ b/indra/newview/llfloaterjoystick.cpp
@@ -250,6 +250,13 @@ void LLFloaterJoystick::refresh()
 	initFromSettings();
 }
 
+bool LLFloaterJoystick::addDeviceCallback(std::string &name, LLSD& value, void* userdata)
+{
+    LLFloaterJoystick * floater = (LLFloaterJoystick*)userdata;
+    floater->mJoysticksCombo->add(name, value, ADD_BOTTOM, 1);
+    return false; // keep searching
+}
+
 void LLFloaterJoystick::addDevice(std::string &name, LLSD& value)
 {
     mJoysticksCombo->add(name, value, ADD_BOTTOM, 1);
@@ -264,19 +271,21 @@ void LLFloaterJoystick::refreshListOfDevices()
 
     mHasDeviceList = false;
     
+    void* win_calback = nullptr;
     // di8_devices_callback callback is immediate and happens in scope of getInputDevices()
 #if LL_WINDOWS && !LL_MESA_HEADLESS
     // space navigator is marked as DI8DEVCLASS_GAMECTRL in ndof lib
     U32 device_type = DI8DEVCLASS_GAMECTRL;
-    void* callback = &di8_list_devices_callback;
+    win_calback = di8_list_devices_callback;
+#elif LL_DARWIN
+    U32 device_type = 0;
 #else
-    // MAC doesn't support device search yet
-    // On MAC there is an ndof_idsearch and it is possible to specify product
-    // and manufacturer in NDOF_Device for ndof_init_first to pick specific one
+    // On MAC it is possible to specify product
+    // and manufacturer in NDOF_Device for
+    // ndof_init_first to pick specific device
     U32 device_type = 0;
-    void* callback = NULL;
 #endif
-    if (gViewerWindow->getWindow()->getInputDevices(device_type, callback, this))
+    if (gViewerWindow->getWindow()->getInputDevices(device_type, addDeviceCallback, win_calback, this))
     {
         mHasDeviceList = true;
     }
@@ -418,10 +427,11 @@ void LLFloaterJoystick::onCommitJoystickEnabled(LLUICtrl*, void *joy_panel)
 			joystick->toggleFlycam();
 		}
 	}
-
-    std::string device_id = LLViewerJoystick::getInstance()->getDeviceUUIDString();
-    gSavedSettings.setString("JoystickDeviceUUID", device_id);
-    LL_DEBUGS("Joystick") << "Selected " << device_id << " as joystick." << LL_ENDL;
+    
+    LLViewerJoystick::getInstance()->saveDeviceIdToSettings();
+    
+    std::string device_string = LLViewerJoystick::getInstance()->getDeviceUUIDString();
+    LL_DEBUGS("Joystick") << "Selected " << device_string << " as joystick." << LL_ENDL;
 
     self->refreshListOfDevices();
 }