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/llwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llwindow/llwindow.cpp') diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 1c1e1b6f2b..d954bdf86b 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -417,8 +417,8 @@ void LLSplashScreen::hide() static std::set sWindowList; LLWindow* LLWindowManager::createWindow( - char *title, - char *name, + const char *title, + const char *name, LLCoordScreen upper_left, LLCoordScreen size, U32 flags, @@ -434,7 +434,7 @@ LLWindow* LLWindowManager::createWindow( } LLWindow* LLWindowManager::createWindow( - char *title, char *name, S32 x, S32 y, S32 width, S32 height, U32 flags, + const char *title, const char *name, S32 x, S32 y, S32 width, S32 height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, -- cgit v1.2.3