diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
| commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
| tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/llui/lltextbox.cpp | |
| parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
| parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) | |
merge up to latest viewer-pathfinding (including 3.3.4)
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 ) |