diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
| commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
| tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llinspectobject.cpp | |
| parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
| parent | e3344abb95802646912f357d214538966f3f2357 (diff) | |
automated merge viewer2.0->viewer2.0
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() |