3 files changed, 24 insertions, 1 deletions
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 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>BlockTeleportOffers</key>
+    <map>
+      <key>Comment</key>
+      <string>Block any teleport offer automatically from coming</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DynamicCameraStrength</key>
     <map>
       <key>Comment</key>
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<bool> 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" />
 
+      <check_box
+       control_name="BlockTeleportOffers"
+       follows="left|top"
+       height="20"
+       label="Block any teleport offer automatically from coming"
+       layout="topleft"
+       left="15"
+       name="block_teleport_offers"
+       top_pad="6"
+       width="450" />
+
     </panel>
 
   </tab_container>