diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
| commit | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (patch) | |
| tree | bafaaa1220764a6f989f84cb434e82ef341a27c7 /indra/newview/llinspectobject.cpp | |
| parent | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (diff) | |
| parent | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff) | |
automated merge
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 e4ee953eae..c0b6f32cb8 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() |