diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 16:14:53 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 16:14:53 +0000 |
| commit | 210fed642b5fe0d837b9dd84a8988d5f17bbd1c1 (patch) | |
| tree | 7a0d53814b5955b7256eb33d7c1a6fd3fafb824a /indra/newview/llinspectobject.cpp | |
| parent | 9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff) | |
| parent | 0a41542f2388a3b6142a15fef653b3e663e1dcc7 (diff) | |
PE 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 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() |