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/llui/llui.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/llui/llui.cpp') diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index f7489a7512..1a238ce7fa 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -41,25 +41,19 @@ #include "audioengine.h" #include "v2math.h" #include "v4color.h" -#include "llgl.h" #include "llglimmediate.h" #include "llrect.h" #include "llimagegl.h" -//#include "llviewerimage.h" #include "lldir.h" #include "llfontgl.h" // Project includes -//#include "audioengine.h" #include "llcontrol.h" -//#include "llstartup.h" #include "llui.h" #include "llview.h" #include "lllineeditor.h" #include "llwindow.h" -#include "llglheaders.h" - // // Globals // -- cgit v1.2.3