summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-29 11:07:27 -0400
committerOz Linden <oz@lindenlab.com>2011-07-29 11:07:27 -0400
commit58ff6b5033e514381a3e9e54d0d6fa681dcc1205 (patch)
treeb532391e764ecf4e743a3728ab421450c7a83f6c /indra/newview/llexpandabletextbox.cpp
parent8554772a3ce7572aacc2f2d27c66438970103570 (diff)
parente67bc887377c7a2eecaa2135c3e6c0f27724f3b5 (diff)
merge changes for storm-1311
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();