diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-01-25 17:29:44 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-01-25 17:29:44 -0600 |
| commit | b8f74b42a7a2d08e9c7a2dcebec58dbd07ec0328 (patch) | |
| tree | 8005cf6ee51fc1d0d1b7fdce07afd908335a4f23 /indra/newview/lltoolpie.cpp | |
| parent | ac6a19d456089e40d6d849a7b8aea1bc6b136c12 (diff) | |
MAINT-2268 Add right-click->"Mute Particle Owner" feature
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | 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 a0c12df834..33bdc8ddcd 100644 --- 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 @@ -1711,6 +1711,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. |