From 69fc05ffbc400e2f9dcc04ed799fdc9c2bf8c781 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Mar 2018 20:01:01 +0100 Subject: [PATCH] FIRE-1396: Make right-click on transparent objects optional via FSEnableRightclickOnTransparentObjects debug setting --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/lltoolpie.cpp | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 764740c16f..e8a90768f5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24554,6 +24554,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value Scripting + FSEnableRightclickOnTransparentObjects + + Comment + If enabled, right-clicks on transparent objects will open the context menu + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 553bea5b0c..971eea732a 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -139,7 +139,7 @@ BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask) // don't pick transparent so users can't "pay" transparent objects // 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); // mPick.mKeyMask = mask;