Mantis #7934 and related: landing points and telehubs for gods. Added a new configuration variable LandingPointBehavior that can switch between what we're used to in OpenSim and the behavior in SL.

2 files changed, 10 insertions, 0 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 90ecb72..141c608 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -653,6 +653,11 @@
     ;; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
     ;DisableInterRegionTeleportCancellation = false
 
+    ;# {LandingPointBehavior} {} {How to honor landing points and telehubs for gods.} {LandingPointBehavior_OS LandingPointBehavior_SL} LandingPointBehavior_OS
+        ;; This option exists to control the behavior of teleporting gods into places that have landing points
+        ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for
+        ;; avatars with god permissions; SL lets gods land wherever they want.
+        ;LandingPointBehavior = LandingPointBehavior_OS
 
 [Messaging]
     ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fbe4379..a55d762 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -808,6 +808,11 @@
     ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
     DisableInterRegionTeleportCancellation = false
 
+        ;; This option exists to control the behavior of teleporting gods into places that have landing points
+        ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for
+        ;; avatars with god permissions; SL lets gods land wherever they want.
+        LandingPointBehavior = LandingPointBehavior_OS
+
 
 [Messaging]
     ; Control which region module is used for instant messaging.