summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-07-02 09:40:49 -0700
committercallum_linden <none@none>2015-07-02 09:40:49 -0700
commit71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch)
tree9eab3e24208d2aecedf29eed0eebb6f209197475 /indra/newview/llexpandabletextbox.cpp
parentd89b4109f9ac3f1ef95480823df292bbc8200347 (diff)
parent8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff)
Merge with head
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)