diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-08-19 17:17:20 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-08-19 17:17:20 -0700 |
| commit | 98628066eb27d4f2616479538ae20a07bf92cd98 (patch) | |
| tree | e5c26ec684cabcbf51d6cc24c7230e5b8413eb10 /indra/newview/lltoolpie.cpp | |
| parent | b33354e1d19f8efafda8b41748c576227595bf5e (diff) | |
| parent | 171089207b528ab80a954292c127ba77254ee927 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rwxr-xr-x | indra/newview/lltoolpie.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index fc9a316759..1c362c18e0 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -121,7 +121,7 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask) { // don't pick transparent so users can't "pay" transparent objects - mPick = gViewerWindow->pickImmediate(x, y, FALSE); + mPick = gViewerWindow->pickImmediate(x, y, FALSE, TRUE); mPick.mKeyMask = mask; // claim not handled so UI focus stays same @@ -1687,6 +1687,13 @@ BOOL LLToolPie::handleRightClickPick() showVisualContextMenuEffect(); } } + else if (mPick.mParticleOwnerID.notNull()) + { + if (gMenuMuteParticle && mPick.mParticleOwnerID != gAgent.getID()) + { + gMenuMuteParticle->show(x,y); + } + } LLTool::handleRightMouseDown(x, y, mask); // We handled the event. |