summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-02 17:15:46 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-02 17:15:46 -0500
commitf22fc1e6129a7e56421a0777d69c64265d9ec4af (patch)
tree43dc78b1795ef407db7b9124472626fa77ae6621 /indra/llui/lltextbase.cpp
parent847a3a12208359653aa7432f7f64c31669ec8963 (diff)
parente3344abb95802646912f357d214538966f3f2357 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 259522a932..b977e50bc1 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1024,6 +1024,16 @@ void LLTextBase::setReadOnlyColor(const LLColor4 &c)
}
//virtual
+void LLTextBase::handleVisibilityChange( BOOL new_visibility )
+{
+ if(!new_visibility && mPopupMenu)
+ {
+ mPopupMenu->hide();
+ }
+ LLUICtrl::handleVisibilityChange(new_visibility);
+}
+
+//virtual
void LLTextBase::setValue(const LLSD& value )
{
setText(value.asString());