diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-23 19:21:34 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-23 19:21:34 -0700 |
| commit | 4feef5af63f6294249aa50e37fba712cd9ddec91 (patch) | |
| tree | d288ba7c65611f95762c20b6a7c244d7348bcec8 /indra/llui/lltextbox.cpp | |
| parent | e7e0e514fdc3b522787e18fddee89b9f9fbbe834 (diff) | |
| parent | 364566924188c7aed5d391bf9a226fc4779ba020 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
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 ) |