diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/llui/llui.cpp | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
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
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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 // |