livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-1396: Make right-click on transparent objects optional via FSEnableRightclickOnTransparentObjects debug setting

master
Ansariel 2018-03-20 20:01:01 +01:00
parent c6ce3d5f0a
commit 69fc05ffbc
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -24554,6 +24554,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<string>Scripting</string>
</map>
<key>FSEnableRightclickOnTransparentObjects</key>
<map>
<key>Comment</key>
<string>If enabled, right-clicks on transparent objects will open the context menu</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

2
indra/newview/lltoolpie.cpp
View File

@ -139,7 +139,7 @@ BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
// don't pick transparent so users can't "pay" transparent objects
// <FS:Ansariel> FIRE-1396: Allow selecting transparent objects
//mPick = gViewerWindow->pickImmediate(x, y, /*BOOL pick_transparent*/ FALSE, /*BOOL pick_rigged*/ TRUE, /*BOOL pick_particle*/ TRUE);
mPick = gViewerWindow->pickImmediate(x, y, /*BOOL pick_transparent*/ TRUE, /*BOOL pick_rigged*/ TRUE, /*BOOL pick_particle*/ TRUE);
mPick = gViewerWindow->pickImmediate(x, y, /*BOOL pick_transparent*/ gSavedSettings.getBOOL("FSEnableRightclickOnTransparentObjects"), /*BOOL pick_rigged*/ TRUE, /*BOOL pick_particle*/ TRUE);
// </FS:Ansariel>
mPick.mKeyMask = mask;