From ad332810078a0bbb8fa08fcbfdf3d756de6914f6 Mon Sep 17 00:00:00 2001 From: Steven Bennetts <steve@lindenlab.com> Date: Fri, 6 Jun 2008 22:43:38 +0000 Subject: QAR-650 - Viewer RC 9 merge -> release (post cmake) merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release --- indra/llwindow/llwindowwin32.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 3ed566062f..e715080916 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -605,8 +605,6 @@ LLWindowWin32::LLWindowWin32(const char *title, const char *name, S32 x, S32 y, // Initialize (boot strap) the Language text input management, // based on the system's (or user's) default settings. allowLanguageTextInput(NULL, FALSE); - - SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer } @@ -1349,6 +1347,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO //make sure multi sampling is disabled by default glDisable(GL_MULTISAMPLE_ARB); + //register joystick timer callback + SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer // ok to post quit messages now mPostQuit = TRUE; -- cgit v1.2.3