summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-02-24 21:02:12 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-02-24 21:02:12 -0500
commitb5324afb6f2e45deefb9b79e7e2192bc686b181a (patch)
treedcae0395e2975f736a90c1fa3c67d6f318e01cc7 /indra/newview/llexpandabletextbox.cpp
parent9b45bc992edf8d049d8a1abe2e778870a493295a (diff)
parentc7841b48bdec74848a64e2dd0eac453ce855093d (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-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)