From 7a204dcbf1e826ea2ccdbbf46f3559d4ba999ff1 Mon Sep 17 00:00:00 2001 From: leviathan Date: Thu, 24 Sep 2026 13:34:56 -0700 Subject: fix game-control flycam and misc preferences UI --- indra/llwindow/llgamecontrol.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llgamecontrol.cpp b/indra/llwindow/llgamecontrol.cpp index 64a8f148c6..7c4a45f083 100755 --- a/indra/llwindow/llgamecontrol.cpp +++ b/indra/llwindow/llgamecontrol.cpp @@ -789,19 +789,22 @@ namespace flycam_axes["Pan left/right"] = "AXIS_RIGHTX"; flycam_axes["Tilt up/down"] = "AXIS_RIGHTY"; flycam_axes["Boom up/down"] = "AXIS_TRIGGERS"; - flycam_axes["Roll left/right"] = "AXIS_NONE"; + flycam_axes["Roll CCW/CW"] = "AXIS_NONE"; LLSD flycam_buttons; flycam_buttons["Zoom out"] = "BUTTON_SOUTH"; flycam_buttons["Zoom in"] = "BUTTON_NORTH"; flycam_buttons["Toggle mouse cursor"] = "BUTTON_SELECT"; flycam_buttons["Toggle flycam" ] = "BUTTON_RIGHT_STICK"; - flycam_buttons["Unroll"] = "BUTTON_LEFT_STICK"; - flycam_buttons["Roll CCW"] = "BUTTON_WEST"; - flycam_buttons["Roll CW"] = "BUTTON_EAST"; + // Unbound by default: Roll/Unroll only do anything once "Allow Roll" is + // turned on (see LLGameControl::isFlycamRollAllowed()), so a fresh + // install shouldn't have them occupying buttons before the user opts in. + flycam_buttons["Unroll"] = "BUTTON_NONE"; + flycam_buttons["Roll CCW"] = "BUTTON_NONE"; + flycam_buttons["Roll CW"] = "BUTTON_NONE"; flycam_buttons["Orbit"] = "BUTTON_RIGHT_SHOULDER"; // Unbound by default -- every physical button above is already claimed, - // same reasoning as "Zoom +/-"/"Roll left/right" being unbound axes. + // same reasoning as "Zoom +/-"/"Roll CCW/CW" being unbound axes. // Resets straight back to Avatar mode (see AVATAR_ACTION_ESCAPE/ // FLYCAM_ACTION_ESCAPE and LLAgent::resetToAvatarMode()). flycam_buttons["ESC"] = "BUTTON_NONE"; -- cgit v1.3