summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-02 16:14:53 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-02 16:14:53 +0000
commit210fed642b5fe0d837b9dd84a8988d5f17bbd1c1 (patch)
tree7a0d53814b5955b7256eb33d7c1a6fd3fafb824a /indra/llui/lltextbase.cpp
parent9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff)
parent0a41542f2388a3b6142a15fef653b3e663e1dcc7 (diff)
PE merge.
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());