From 5f09e6709877d2782a1a96264c545ace7f22519b Mon Sep 17 00:00:00 2001 From: Cho Date: Wed, 20 Aug 2014 00:20:06 +0100 Subject: Made expandable_text take max_length as a parameter and set experience profile description max_length to 2048 for ACME-1583 --- indra/newview/llexpandabletextbox.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llexpandabletextbox.cpp') diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index a50184460b..b8a3b73c5c 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) @@ -211,6 +211,7 @@ LLExpandableTextBox::Params::Params() : textbox("textbox"), scroll("scroll"), max_height("max_height", 0), + max_text_length("max_length", 255), bg_visible("bg_visible", false), expanded_bg_visible("expanded_bg_visible", true), bg_color("bg_color", LLColor4::black), @@ -236,6 +237,7 @@ LLExpandableTextBox::LLExpandableTextBox(const Params& p) LLTextBoxEx::Params textbox_params = p.textbox; textbox_params.rect(rc); + textbox_params.max_text_length = p.max_text_length; mTextBox = LLUICtrlFactory::create(textbox_params); mScroll->addChild(mTextBox); -- cgit v1.2.3 From 55ed31173798a7d5a3b7cb42c6d6d552820c5e14 Mon Sep 17 00:00:00 2001 From: Cho Date: Wed, 20 Aug 2014 00:46:49 +0100 Subject: Reverted change to expandable_text, to use pre-existing functionality to fix ACME-1583 --- indra/newview/llexpandabletextbox.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llexpandabletextbox.cpp') diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index b8a3b73c5c..f2602c8c7d 100755 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -211,7 +211,6 @@ LLExpandableTextBox::Params::Params() : textbox("textbox"), scroll("scroll"), max_height("max_height", 0), - max_text_length("max_length", 255), bg_visible("bg_visible", false), expanded_bg_visible("expanded_bg_visible", true), bg_color("bg_color", LLColor4::black), @@ -237,7 +236,6 @@ LLExpandableTextBox::LLExpandableTextBox(const Params& p) LLTextBoxEx::Params textbox_params = p.textbox; textbox_params.rect(rc); - textbox_params.max_text_length = p.max_text_length; mTextBox = LLUICtrlFactory::create(textbox_params); mScroll->addChild(mTextBox); -- cgit v1.2.3