diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2010-02-02 20:11:57 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2010-02-02 20:11:57 +0200 |
| commit | 1da3feec8b99d938aa5df6f89e785fb317c88c45 (patch) | |
| tree | 2e1f4272e5eda4ecc1d808556ed0daabbd97a807 /indra/newview/llinspectobject.cpp | |
| parent | 47162acede25dadae52fb43bd36f57fa26988aa5 (diff) | |
| parent | e367c412988a55515fb68179d21f5d1c19249969 (diff) | |
merge
--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() |