From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 2 Jun 2008 21:14:31 +0000 Subject: svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers --- indra/llwindow/llwindowsdl.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llwindow/llwindowsdl.cpp') diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 8ca0b4b4b8..50925dcebf 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -41,8 +41,6 @@ #include "lldir.h" #include "llfindlocale.h" -#include "llglheaders.h" - #include "indra_constants.h" #if LL_GTK @@ -219,7 +217,7 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card) -LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width, +LLWindowSDL::LLWindowSDL(const char *title, S32 x, S32 y, S32 width, S32 height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, -- cgit v1.2.3