diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-02 14:25:31 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-02 14:25:31 +0200 |
| commit | 38315a063d83bf4dbf90569dbe37a344d91349a7 (patch) | |
| tree | 25eb74272dd682706667118d4aee8aecff24cc87 /indra/newview/llinspectavatar.cpp | |
| parent | c679ae3546ffe0f29330a2969460fa37807e23b6 (diff) | |
Fixed normal bug EXT-4740 - Object inspector hides however context menu present
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 3a41aebf28..b2cdc0738f 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -393,11 +393,18 @@ void LLInspectAvatar::onMouseLeave(S32 x, S32 y, MASK mask) { LLMenuGL* gear_menu = getChild<LLMenuButton>("gear_btn")->getMenu(); LLMenuGL* gear_menu_self = getChild<LLMenuButton>("gear_self_btn")->getMenu(); - if ( !(gear_menu && gear_menu->getVisible()) && - !(gear_menu_self && gear_menu_self->getVisible())) + if ( gear_menu && gear_menu->getVisible() && + gear_menu_self && gear_menu_self->getVisible() ) { - mOpenTimer.unpause(); + return; + } + + if(childHasVisiblePopupMenu()) + { + return; } + + mOpenTimer.unpause(); } void LLInspectAvatar::updateModeratorPanel() |