summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-07-07 17:06:09 -0400
committerOz Linden <oz@lindenlab.com>2015-07-07 17:06:09 -0400
commitf7d94905db3f39785863b91f75daf612dc6c3c48 (patch)
treeca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/newview/llexpandabletextbox.cpp
parentfa1913ea679fd895d709da5c5782b26c7d03a40a (diff)
parent4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff)
merge changes for 3.8.0-release
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rwxr-xr-xindra/newview/llexpandabletextbox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index a50184460b..f2602c8c7d 100755
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -116,7 +116,7 @@ LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p)
mExpanderVisible(false)
{
setIsChrome(TRUE);
-
+ setMaxTextLength(p.max_text_length);
}
void LLExpandableTextBox::LLTextBoxEx::reshape(S32 width, S32 height, BOOL called_from_parent)