summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/newview/llexpandabletextbox.cpp2
-rwxr-xr-xindra/newview/llexpandabletextbox.h2
-rw-r--r--indra/newview/skins/default/xui/en/floater_experienceprofile.xml2
3 files changed, 1 insertions, 5 deletions
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<LLTextBoxEx>(textbox_params);
mScroll->addChild(mTextBox);
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index e4f82fbbb2..5dea35bb82 100755
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -104,8 +104,6 @@ public:
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 a8e462ecb4..2dfba1ac44 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -183,7 +183,7 @@
top="0"
value=""
width="293"
- max_length="2048"/>
+ textbox.max_length="2048"/>
</layout_panel>
<layout_panel
follows=""