diff options
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 5 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 5 |
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 @@ | |||
653 | ;; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed. | 653 | ;; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed. |
654 | ;DisableInterRegionTeleportCancellation = false | 654 | ;DisableInterRegionTeleportCancellation = false |
655 | 655 | ||
656 | ;# {LandingPointBehavior} {} {How to honor landing points and telehubs for gods.} {LandingPointBehavior_OS LandingPointBehavior_SL} LandingPointBehavior_OS | ||
657 | ;; This option exists to control the behavior of teleporting gods into places that have landing points | ||
658 | ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for | ||
659 | ;; avatars with god permissions; SL lets gods land wherever they want. | ||
660 | ;LandingPointBehavior = LandingPointBehavior_OS | ||
656 | 661 | ||
657 | [Messaging] | 662 | [Messaging] |
658 | ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *} | 663 | ;# {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 @@ | |||
808 | ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed. | 808 | ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed. |
809 | DisableInterRegionTeleportCancellation = false | 809 | DisableInterRegionTeleportCancellation = false |
810 | 810 | ||
811 | ;; This option exists to control the behavior of teleporting gods into places that have landing points | ||
812 | ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for | ||
813 | ;; avatars with god permissions; SL lets gods land wherever they want. | ||
814 | LandingPointBehavior = LandingPointBehavior_OS | ||
815 | |||
811 | 816 | ||
812 | [Messaging] | 817 | [Messaging] |
813 | ; Control which region module is used for instant messaging. | 818 | ; Control which region module is used for instant messaging. |