From bb07a38f6273ee38625e34388dcf83c097e646d2 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Tue, 14 Sep 2010 19:02:42 +0300 Subject: STORM-112 FIXED Fixed EOLs display as "squares" in expandable textboxes after resize. This problem reproduced not only on minimize of certain floaters from description, but for all expandable textboxes after resizes. It happened because of hideExpandText() call in LLTextBoxEx::reshape() that broke lineendings. - Removed it from there so text expands now only when clicking "More" link- it's the only time when it should be shown, and also doesn't have problem with breaking anything because of calling setTextBase() after it. --- indra/newview/llexpandabletextbox.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llexpandabletextbox.cpp') diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index f0c2469977..5e10f60aba 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -121,7 +121,6 @@ LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p) void LLExpandableTextBox::LLTextBoxEx::reshape(S32 width, S32 height, BOOL called_from_parent) { - hideExpandText(); LLTextEditor::reshape(width, height, called_from_parent); if (getTextPixelHeight() > getRect().getHeight()) -- cgit v1.2.3