From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 27 Feb 2008 18:58:14 +0000
Subject: Merge of windlight into release (QAR-286).  This includes all changes
 in windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
---
 indra/llwindow/llwindow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindow.h')

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 0554d3a8db..bc444ae811 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -258,7 +258,7 @@ protected:
 	ESwapMethod mSwapMethod;
 	BOOL		mHideCursorPermanent;
 	U32			mFlags;
-	F32			mJoyAxis[6]; 
+	F32			mJoyAxis[8]; 
 	U8			mJoyButtonState[16];
 	U16			mHighSurrogate;
 
-- 
cgit v1.2.3