summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
-rw-r--r--indra/llui/llscrolllistctrl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 78f34a2ed2..5ceee2e1f6 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -101,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; }
@@ -169,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),