diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-08-11 07:36:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-08-11 07:36:07 +0800 |
| commit | c711e99809d01f0e509f4ea0b4fbb3e5456e7536 (patch) | |
| tree | bb816d25e56c6959afe45ba5267aa11a9c53926a /indra/newview/llimprocessing.cpp | |
| parent | edbdb9c55ec429493f8f0d652c7a882553baa802 (diff) | |
| parent | 8b598aef44780ab162ddad3596699d3d877ec362 (diff) | |
Merge branch 'main' into 26.326.3
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 3f60dc5d26..54d17be370 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<bool> block_teleport_offers(gSavedSettings, "BlockTeleportOffers"); + if (is_muted || block_teleport_offers) { return; } |