aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/lltextbox.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/lltextbox.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index ba0747f..c0b0788 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -2,6 +2,8 @@
2 * @file lltextbox.cpp 2 * @file lltextbox.cpp
3 * @brief A text display widget 3 * @brief A text display widget
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#include "linden_common.h" 32#include "linden_common.h"
@@ -158,7 +161,7 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
158 return handled; 161 return handled;
159} 162}
160 163
161void LLTextBox::setText(const LLString& text) 164void LLTextBox::setText(const LLStringExplicit& text)
162{ 165{
163 mText.assign(text); 166 mText.assign(text);
164 setLineLengths(); 167 setLineLengths();
@@ -191,7 +194,7 @@ void LLTextBox::setLineLengths()
191 } 194 }
192} 195}
193 196
194void LLTextBox::setWrappedText(const LLString& in_text, F32 max_width) 197void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
195{ 198{
196 if (max_width < 0.0) 199 if (max_width < 0.0)
197 { 200 {
@@ -283,7 +286,7 @@ LLSD LLTextBox::getValue() const
283 return LLSD(getText()); 286 return LLSD(getText());
284} 287}
285 288
286BOOL LLTextBox::setTextArg( const LLString& key, const LLString& text ) 289BOOL LLTextBox::setTextArg( const LLString& key, const LLStringExplicit& text )
287{ 290{
288 mText.setArg(key, text); 291 mText.setArg(key, text);
289 setLineLengths(); 292 setLineLengths();