diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-20 10:37:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-20 10:37:10 -0400 |
| commit | c42a91421ff4691e6d2efa5744fe3f246510649c (patch) | |
| tree | 0ce60a84e78b802c7f936e3b4cb1503edb2fa945 /indra/newview/lltoolpie.cpp | |
| parent | d2b947c1fa0757e94eb74429a339a8198531dd93 (diff) | |
| parent | 171089207b528ab80a954292c127ba77254ee927 (diff) | |
merge changes for 3.6.3-release
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. |