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/llviewerstats.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewerstats.cpp') diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index c97c3d6952..ab0ef9df4a 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -56,8 +56,8 @@ #include "llviewerwindow.h" // *TODO: remove, only used for width/height #include "llworld.h" #include "llfeaturemanager.h" -#if LL_WINDOWS && LL_LCD_COMPILE - #include "lllcd.h" +#if LL_LCD_COMPILE +#include "lllcd.h" #endif @@ -597,7 +597,7 @@ void update_statistics(U32 frame_count) LLViewerImageList::sTextureBits = 0; LLViewerImageList::sTexturePackets = 0; -#if LL_WINDOWS && LL_LCD_COMPILE +#if LL_LCD_COMPILE bool LCDenabled = gLcdScreen->Enabled(); LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled); #else -- cgit v1.2.3