1 files changed, 19 insertions, 31 deletions

diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 5e05f03..9963228 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -143,6 +143,11 @@ BOOL LLWindowCallbacks::handleActivate(LLWindow *window, BOOL activated)
         return FALSE;
 }
 
+BOOL LLWindowCallbacks::handleActivateApp(LLWindow *window, BOOL activating)
+{
+        return FALSE;
+}
+
 void LLWindowCallbacks::handleMouseMove(LLWindow *window, const LLCoordGL pos, MASK mask)
 {
 }
@@ -190,6 +195,15 @@ void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *da
 {
 }
 
+BOOL LLWindowCallbacks::handleTimerEvent(LLWindow *window)
+{
+        return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
+{
+        return FALSE;
+}
 
 S32 OSMessageBox(const char* text, const char* caption, U32 type)
 {
@@ -247,15 +261,6 @@ LLWindow::LLWindow(BOOL fullscreen, U32 flags)
           mFlags(flags),
           mHighSurrogate(0)
 {
-        for (U32 i = 0; i < 8; i++)
-        {
-                mJoyAxis[i] = 0;
-        }
-
-        for (U32 i = 0; i < 16; i++)
-        {
-                mJoyButtonState[i] = 0;
-        }
 }
         
 // virtual
@@ -273,24 +278,6 @@ void LLWindow::decBusyCount()
         }
 }
 
-F32 LLWindow::getJoystickAxis(U32 axis)
-{
-        if (axis < 8)
-        {
-                return mJoyAxis[axis];
-        }
-        return 0.f;
-}
-
-U8 LLWindow::getJoystickButton(U32 button)
-{
-        if (button < 16)
-        {
-                return mJoyButtonState[button];
-        }
-        return 0;
-}
-
 void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
 {
         mCallbacks = callbacks;
@@ -440,7 +427,8 @@ LLWindow* LLWindowManager::createWindow(
         BOOL clearBg,
         BOOL disable_vsync,
         BOOL use_gl,
-        BOOL ignore_pixel_depth)
+        BOOL ignore_pixel_depth,
+        U32 fsaa_samples)
 {
         LLWindow* new_window;
 
@@ -453,15 +441,15 @@ LLWindow* LLWindowManager::createWindow(
 #elif LL_SDL
                 new_window = new LLWindowSDL(
                         title, x, y, width, height, flags, 
-                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_WINDOWS
                 new_window = new LLWindowWin32(
                         title, name, x, y, width, height, flags, 
-                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_DARWIN
                 new_window = new LLWindowMacOSX(
                         title, name, x, y, width, height, flags, 
-                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_LINUX
                 new_window = new LLWindowLinux(
                         title, name, x, y, width, height, flags,