summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarlist.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-18 10:58:18 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-18 10:58:18 +0100
commit478c28539b64925526e79844c829cdd012c0b8ec (patch)
tree6e580ae150bc6942b393ad4bb73213c9f81fe909 /indra/newview/llavatarlist.cpp
parentff7e83c3aa26bbaa380305a97dffbf22c0f7a747 (diff)
parentb6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llavatarlist.cpp')
-rw-r--r--indra/newview/llavatarlist.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 47ec5270c3..72ee289c91 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -399,6 +399,15 @@ BOOL LLAvatarList::handleRightMouseDown(S32 x, S32 y, MASK mask)
return handled;
}
+void LLAvatarList::setVisible(BOOL visible)
+{
+ if ( visible == FALSE && mContextMenu )
+ {
+ mContextMenu->hide();
+ }
+ LLFlatListViewEx::setVisible(visible);
+}
+
void LLAvatarList::computeDifference(
const uuid_vec_t& vnew_unsorted,
uuid_vec_t& vadded,