From 8b598aef44780ab162ddad3596699d3d877ec362 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 11 Aug 2026 07:35:32 +0800 Subject: Teleport blocker https://megapahit.com/show_bug.cgi?id=9 --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llimprocessing.cpp | 3 ++- indra/newview/skins/default/xui/en/panel_preferences_move.xml | 11 +++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1a61e45180..c6b7d8eddb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2774,6 +2774,17 @@ Value 0 + BlockTeleportOffers + + Comment + Block any teleport offer automatically from coming + Persist + 1 + Type + Boolean + Value + 0 + DynamicCameraStrength Comment diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 779ed725ac..9366f1e65a 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -1206,7 +1206,8 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, case IM_LURE_USER: case IM_TELEPORT_REQUEST: { - if (is_muted) + static LLCachedControl block_teleport_offers(gSavedSettings, "BlockTeleportOffers"); + if (is_muted || block_teleport_offers) { return; } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 979aa691fc..f26958c8bd 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -495,6 +495,17 @@ tool_tip="Do not show the fullscreen progress/black screen during teleports" width="450" /> + + -- cgit v1.3