diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
| commit | bedbbf7c0201275e0a48a0cbbb2a567be4baab3d (patch) | |
| tree | f11f9e612ab503e596073269c17c6e4cc1d3ae13 /indra/llui/lltextbox.cpp | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | f3afac420cd3c89eb396fb1f0b77ab4804212415 (diff) | |
Merge
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 ) |