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/llinspectobject.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/llinspectobject.cpp')
| -rw-r--r-- | indra/newview/llinspectobject.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index dd313c528d..1a5795a2ae 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -575,10 +575,17 @@ void LLInspectObject::updateSecureBrowsing() void LLInspectObject::onMouseLeave(S32 x, S32 y, MASK mask) { LLMenuGL* gear_menu = getChild<LLMenuButton>("gear_btn")->getMenu(); - if ( !(gear_menu && gear_menu->getVisible())) + if ( gear_menu && gear_menu->getVisible() ) { - mOpenTimer.unpause(); + return; + } + + if(childHasVisiblePopupMenu()) + { + return; } + + mOpenTimer.unpause(); } void LLInspectObject::onClickBuy() |