Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.

1 files changed, 9 insertions, 13 deletions

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;