diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
| commit | a4d81d0f6995ad52f3c0fc094d93f8652600abbd (patch) | |
| tree | 9fcc82ba3061423c971f56aa70b8447de2677237 /indra/newview/llinspectavatar.cpp | |
| parent | 3fde73508e5b2fb5507b47d1f56d3fb47162b6fc (diff) | |
| parent | b90d1d0b6f60684ba2e97959c6a9d2df0ff8ec79 (diff) | |
Merge
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() |