From 5f09e6709877d2782a1a96264c545ace7f22519b Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
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 +++-
indra/newview/llexpandabletextbox.h | 2 ++
indra/newview/skins/default/xui/en/floater_experienceprofile.xml | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
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<LLTextBoxEx>(textbox_params);
mScroll->addChild(mTextBox);
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index 399e48bea2..e4f82fbbb2 100755
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -103,6 +103,8 @@ public:
Optional<LLScrollContainer::Params> scroll;
Optional<S32> max_height;
+
+ Optional<S32> max_text_length;
Optional<bool> bg_visible,
expanded_bg_visible;
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index d146d1306f..a8e462ecb4 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -182,7 +182,8 @@
name="experience_description"
top="0"
value=""
- width="293"/>
+ width="293"
+ max_length="2048"/>
</layout_panel>
<layout_panel
follows=""
--
cgit v1.2.3