summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llview.cpp16
-rw-r--r--indra/llui/llview.h22
2 files changed, 16 insertions, 22 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index b87d82653a..65e6a4921b 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -11,23 +11,21 @@
#include "llview.h"
-#include "llstring.h"
-#include "llrect.h"
-#include "llgl.h"
+#include <cassert>
+#include <boost/tokenizer.hpp>
+
#include "llevent.h"
#include "llfontgl.h"
#include "llfocusmgr.h"
+#include "llgl.h"
#include "llglheaders.h"
-#include "llwindow.h"
+#include "llrect.h"
#include "llstl.h"
-#include "lluictrl.h"
#include "llui.h" // colors saved settings
+#include "lluictrl.h"
+#include "llwindow.h"
#include "v3color.h"
-#include "llstl.h"
-
-#include <boost/tokenizer.hpp>
-#include <assert.h>
BOOL LLView::sDebugRects = FALSE;
BOOL LLView::sDebugKeys = FALSE;
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 18f453f621..94586bf4fa 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -13,23 +13,19 @@
// the HUD or a dialog box or a button. It can also contain sub-views
// and child widgets
-#include <iosfwd>
-#include <list>
-
-#include "lluixmltags.h"
-#include "llrect.h"
+#include "llcoord.h"
+#include "llfontgl.h"
+#include "llmortician.h"
#include "llmousehandler.h"
-#include "stdenums.h"
+#include "llnametable.h"
#include "llsd.h"
#include "llstring.h"
-#include "llnametable.h"
-#include "llcoord.h"
-#include "llmortician.h"
-#include "llxmlnode.h"
-#include "llfontgl.h"
-#include "llviewquery.h"
-
+#include "llrect.h"
#include "llui.h"
+#include "lluixmltags.h"
+#include "llviewquery.h"
+#include "llxmlnode.h"
+#include "stdenums.h"
class LLColor4;
class LLWindow;