diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 11:57:51 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 11:57:51 -0400 |
| commit | fdb2ae8335f136283910f9538e74724b69886e15 (patch) | |
| tree | 79ed0377590b5d291a301d3ae138145d4cb4608e /indra/llui/lltextbox.cpp | |
| parent | 1d5490e752deeff316658f4850aac5fc96a91866 (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
Merge of viewer-development (3.4.1).
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 ) |