summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-08-02 17:19:09 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-08-02 17:19:09 -0400
commitc7b2a88875e21f7610dd3e7c5d3f528b28d5ab55 (patch)
treea4408b6bdfed37a95f69e16dcab17673cefb6f32 /indra/newview/llexpandabletextbox.cpp
parent9883c33993f7a548c876b43494ffd5835473a211 (diff)
parent9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff)
pulling latest viewer-development into mesh merge branch.
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r--indra/newview/llexpandabletextbox.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 5501b8c2ac..2abfbf37ca 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -415,6 +415,15 @@ void LLExpandableTextBox::onTopLost()
LLUICtrl::onTopLost();
}
+void LLExpandableTextBox::updateTextShape()
+{
+ // I guess this should be done on every reshape(),
+ // but adding this code to reshape() currently triggers bug VWR-26455,
+ // which makes the text virtually unreadable.
+ llassert(!mExpanded);
+ updateTextBoxRect();
+}
+
void LLExpandableTextBox::setValue(const LLSD& value)
{
collapseTextBox();