diff options
| author | callum <none@none> | 2012-06-29 10:36:04 -0700 |
|---|---|---|
| committer | callum <none@none> | 2012-06-29 10:36:04 -0700 |
| commit | 11686a0917c7e6e67920aca46ade4624c5027c0e (patch) | |
| tree | 69f56b63cf711b6aef97e0b06d981e5c8087375a /indra/llui/lltextbox.cpp | |
| parent | fd4708c2c4f221d9f2029072f786e169e119ba1a (diff) | |
| parent | 326634e1bf9b87e9c9311b67539abb43323bd33c (diff) | |
Merge with viewer-beta
Diffstat (limited to 'indra/llui/lltextbox.cpp')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 6a905b7ec0..11cfa1d263 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -150,7 +150,7 @@ S32 LLTextBox::getTextPixelHeight() LLSD LLTextBox::getValue() const { - return LLSD(getText()); + return getViewModel()->getValue(); } BOOL LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text ) |