From b01c75cb423f07a3d3354f8bd62f265f80062b3b Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Thu, 16 Apr 2009 23:45:35 +0000
Subject: svn merge -r117314:117337
 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
---
 indra/newview/llviewerjoystick.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/llviewerjoystick.cpp')

diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 652e50e20c..9f7e4d338b 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -992,6 +992,13 @@ void LLViewerJoystick::scanJoystick()
 #endif
 	updateStatus();
 
+	// App focus check Needs to happen AFTER updateStatus in case the joystick
+	// is not centred when the app loses focus.
+	if (!gFocusMgr.getAppHasFocus())
+	{
+		return;
+	}
+
 	static long toggle_flycam = 0;
 
 	if (mBtn[0] == 1)
-- 
cgit v1.2.3