diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:09:28 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:09:28 -0600 |
| commit | d8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (patch) | |
| tree | 2e7966158d684828422c2b9f0d4129fa1ef1b395 /indra/newview/lltoolpie.cpp | |
| parent | 4290365ebbf5505bee4fbed8043996fa7687fd03 (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 28d0abc9d2..558159775f 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -122,7 +122,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 @@ -1688,6 +1688,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. |