summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
-rw-r--r--indra/llwindow/llwindow.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index d5e1e77053..ccc100a861 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -213,6 +213,10 @@ LLWindow::LLWindow(BOOL fullscreen, U32 flags)
mHideCursorPermanent(FALSE),
mFlags(flags)
{
+ for (U32 i = 0; i < 6; i++)
+ {
+ mJoyAxis[i] = 0;
+ }
}
// virtual
@@ -230,6 +234,15 @@ void LLWindow::decBusyCount()
}
}
+F32 LLWindow::getJoystickAxis(U32 axis)
+{
+ if (axis < 6)
+ {
+ return mJoyAxis[axis];
+ }
+ return 0.f;
+}
+
void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
{
mCallbacks = callbacks;