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.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llexpandabletextbox.h') 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 scroll; Optional max_height; + + Optional max_text_length; Optional bg_visible, expanded_bg_visible; -- 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.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llexpandabletextbox.h') 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 max_height; - Optional max_text_length; - Optional bg_visible, expanded_bg_visible; -- cgit v1.2.3