svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index ccc100a861..f7df94c65c 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -217,6 +217,11 @@ LLWindow::LLWindow(BOOL fullscreen, U32 flags)
 	{
 		mJoyAxis[i] = 0;
 	}
+
+	for (U32 i = 0; i < 16; i++)
+	{
+		mJoyButtonState[i] = 0;
+	}
 }
 	
 // virtual
@@ -243,6 +248,15 @@ F32 LLWindow::getJoystickAxis(U32 axis)
 	return 0.f;
 }
 
+U8 LLWindow::getJoystickButton(U32 button)
+{
+	if (button < 16)
+	{
+		return mJoyButtonState[button];
+	}
+	return 0;
+}
+
 void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
 {
 	mCallbacks = callbacks;