diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llui/llpanel.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/llpanel.h')
| -rw-r--r-- | indra/llui/llpanel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 318c278be0..dfd7a51529 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -119,7 +119,7 @@ public: void setBackgroundOpaque(BOOL b) { mBgOpaque = b; } void setDefaultBtn(LLButton* btn = NULL); void setDefaultBtn(const LLString& id); - void setLabel(LLString label) { mLabel = label; } + void setLabel(const LLStringExplicit& label) { mLabel = label; } LLString getLabel() const { return mLabel; } void setRectControl(const LLString& rect_control) { mRectControl.assign(rect_control); } @@ -192,8 +192,8 @@ public: // For setting text / label replacement params, e.g. "Hello [NAME]" // Not implemented for all types, defaults to noop, returns FALSE if not applicaple - BOOL childSetTextArg(const LLString& id, const LLString& key, const LLString& text); - BOOL childSetLabelArg(const LLString& id, const LLString& key, const LLString& text); + BOOL childSetTextArg(const LLString& id, const LLString& key, const LLStringExplicit& text); + BOOL childSetLabelArg(const LLString& id, const LLString& key, const LLStringExplicit& text); // LLSlider / LLSpinCtrl void childSetMinValue(const LLString& id, LLSD min_value); @@ -208,7 +208,7 @@ public: void childSetWrappedText(const LLString& id, const LLString& text, bool visible = true); // LLTextBox/LLTextEditor/LLLineEditor - void childSetText(const LLString& id, const LLString& text); + void childSetText(const LLString& id, const LLStringExplicit& text); LLString childGetText(const LLString& id); // LLLineEditor |