1 files changed, 13 insertions, 14 deletions

diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 053ef82..63c1efc 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -2,6 +2,8 @@
  * @file llview.h
  * @brief Container for other views, anything that draws.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLVIEW_H
@@ -33,23 +36,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;
@@ -291,7 +290,7 @@ public:
         virtual void    setHidden(BOOL hidden);         // Never show (replacement text)
 
         // by default, does nothing and returns false
-        virtual BOOL    setLabelArg( const LLString& key, const LLString& text );
+        virtual BOOL    setLabelArg( const LLString& key, const LLStringExplicit& text );
 
         virtual void    onVisibilityChange ( BOOL curVisibilityIn );