1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 2e4dad5..5ceee2e 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -2,6 +2,8 @@
  * @file llscrolllistctrl.h
  * @brief LLScrollListCtrl base class
  *
+ * $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_SCROLLLISTCTRL_H
@@ -98,7 +101,7 @@ public:
         virtual const LLString&         getText() const         { return mText.getString(); }
         virtual BOOL    getVisible() const  { return mVisible; }
         virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
-        void                    setText(const LLString& text);
+        void                    setText(const LLStringExplicit& text);
         virtual void    setColor(const LLColor4&);
         virtual BOOL    isText() { return TRUE; }
 
@@ -166,10 +169,10 @@ class LLScrollListColumn
 public:
         // Default constructor
         LLScrollListColumn() : 
-                mName(""), 
-                mSortingColumn(""), 
-                mSortAscending(TRUE), 
-                mLabel(""), 
+                mName(), 
+                mSortingColumn(), 
+                mSortAscending(TRUE), 
+                mLabel(), 
                 mWidth(-1), 
                 mRelWidth(-1.0), 
                 mDynamicWidth(FALSE),