summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-08-02 14:41:28 -0700
committerMerov Linden <merov@lindenlab.com>2011-08-02 14:41:28 -0700
commit8d081d34fc56fd1b742045dd120b6acbda0d027e (patch)
treebad359d12509e1543db1d24970f18f8ba88d01a1 /indra/newview/llexpandabletextbox.cpp
parent75d2382dc3fd1beb190eba12188883db98278f89 (diff)
parent9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff)
Sync with lindenlab/viewer-development
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();