1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index ab684833ed..8e1169ddbd 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -51,6 +51,8 @@
 #include "llfloatertools.h"
 #include "lldebugview.h"
 #include "llfasttimerview.h"
+#include "llgamecontrol.h"
+#include "llviewerjoystick.h"
 #include "llviewerregion.h"
 #include "llvoavatar.h"
 #include "llvoavatarself.h"
@@ -782,6 +784,17 @@ void send_viewer_stats(bool include_preferences)
 
     system["shader_level"] = shader_level;
 
+    LLSD game_control = LLGameControl::getSessionStatsAsLLSD();
+    if (game_control["devices"].size() > 0)
+    {
+        body["game_control"] = game_control;
+    }
+    LLSD ndof = LLViewerJoystick::instance().getSessionStatsAsLLSD();
+    if (ndof["devices"].size() > 0)
+    {
+        body["3DConnexion"] = ndof;
+    }
+
     LLSD &download = body["downloads"];
 
     download["world_kbytes"] = F64Kilobytes(gTotalWorldData).value();