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/newview/llappviewer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2c9dec3801..a6173f45df 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -791,12 +791,12 @@ bool LLAppViewer::init() // initWindow(); - #if LL_WINDOWS && LL_LCD_COMPILE +#if LL_LCD_COMPILE // start up an LCD window on a logitech keyboard, if there is one HINSTANCE hInstance = GetModuleHandle(NULL); gLcdScreen = new LLLCD(hInstance); CreateLCDDebugWindows(); - #endif +#endif gGLManager.getGLInfo(gDebugInfo); gGLManager.printGLInfoString(); @@ -983,7 +983,7 @@ bool LLAppViewer::mainLoop() LLFloaterSnapshot::update(); // take snapshots -#if LL_WINDOWS && LL_LCD_COMPILE +#if LL_LCD_COMPILE // update LCD Screen gLcdScreen->UpdateDisplay(); #endif @@ -1239,7 +1239,7 @@ bool LLAppViewer::cleanup() // gDXHardware.cleanup(); //#endif // LL_WINDOWS -#if LL_WINDOWS && LL_LCD_COMPILE +#if LL_LCD_COMPILE // shut down the LCD window on a logitech keyboard, if there is one delete gLcdScreen; gLcdScreen = NULL; -- cgit v1.2.3