diff options
Diffstat (limited to 'linden/indra/llui/llpanel.h')
-rw-r--r-- | linden/indra/llui/llpanel.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h index 28c56fa..dfd7a51 100644 --- a/linden/indra/llui/llpanel.h +++ b/linden/indra/llui/llpanel.h | |||
@@ -3,6 +3,8 @@ | |||
3 | * @author James Cook, Tom Yedwab | 3 | * @author James Cook, Tom Yedwab |
4 | * @brief LLPanel base class | 4 | * @brief LLPanel base class |
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
7 | * | ||
6 | * Copyright (c) 2001-2007, Linden Research, Inc. | 8 | * Copyright (c) 2001-2007, Linden Research, Inc. |
7 | * | 9 | * |
8 | * Second Life Viewer Source Code | 10 | * Second Life Viewer Source Code |
@@ -25,6 +27,7 @@ | |||
25 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 27 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
26 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
27 | * COMPLETENESS OR PERFORMANCE. | 29 | * COMPLETENESS OR PERFORMANCE. |
30 | * $/LicenseInfo$ | ||
28 | */ | 31 | */ |
29 | 32 | ||
30 | #ifndef LL_LLPANEL_H | 33 | #ifndef LL_LLPANEL_H |
@@ -116,7 +119,7 @@ public: | |||
116 | void setBackgroundOpaque(BOOL b) { mBgOpaque = b; } | 119 | void setBackgroundOpaque(BOOL b) { mBgOpaque = b; } |
117 | void setDefaultBtn(LLButton* btn = NULL); | 120 | void setDefaultBtn(LLButton* btn = NULL); |
118 | void setDefaultBtn(const LLString& id); | 121 | void setDefaultBtn(const LLString& id); |
119 | void setLabel(LLString label) { mLabel = label; } | 122 | void setLabel(const LLStringExplicit& label) { mLabel = label; } |
120 | LLString getLabel() const { return mLabel; } | 123 | LLString getLabel() const { return mLabel; } |
121 | 124 | ||
122 | void setRectControl(const LLString& rect_control) { mRectControl.assign(rect_control); } | 125 | void setRectControl(const LLString& rect_control) { mRectControl.assign(rect_control); } |
@@ -189,8 +192,8 @@ public: | |||
189 | 192 | ||
190 | // For setting text / label replacement params, e.g. "Hello [NAME]" | 193 | // For setting text / label replacement params, e.g. "Hello [NAME]" |
191 | // Not implemented for all types, defaults to noop, returns FALSE if not applicaple | 194 | // Not implemented for all types, defaults to noop, returns FALSE if not applicaple |
192 | BOOL childSetTextArg(const LLString& id, const LLString& key, const LLString& text); | 195 | BOOL childSetTextArg(const LLString& id, const LLString& key, const LLStringExplicit& text); |
193 | BOOL childSetLabelArg(const LLString& id, const LLString& key, const LLString& text); | 196 | BOOL childSetLabelArg(const LLString& id, const LLString& key, const LLStringExplicit& text); |
194 | 197 | ||
195 | // LLSlider / LLSpinCtrl | 198 | // LLSlider / LLSpinCtrl |
196 | void childSetMinValue(const LLString& id, LLSD min_value); | 199 | void childSetMinValue(const LLString& id, LLSD min_value); |
@@ -205,7 +208,7 @@ public: | |||
205 | void childSetWrappedText(const LLString& id, const LLString& text, bool visible = true); | 208 | void childSetWrappedText(const LLString& id, const LLString& text, bool visible = true); |
206 | 209 | ||
207 | // LLTextBox/LLTextEditor/LLLineEditor | 210 | // LLTextBox/LLTextEditor/LLLineEditor |
208 | void childSetText(const LLString& id, const LLString& text); | 211 | void childSetText(const LLString& id, const LLStringExplicit& text); |
209 | LLString childGetText(const LLString& id); | 212 | LLString childGetText(const LLString& id); |
210 | 213 | ||
211 | // LLLineEditor | 214 | // LLLineEditor |