From 13f3bcae9454041e056df5e37d621ffda2c7a002 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 10 Mar 2013 22:24:34 -0700
Subject: Update comment about setting physics=BulletSimN as the C# Bullet
 version has been wrapped into one BulletSim and the physics engine selection
 is now done as specified in OpenSimDefaults.ini.

---
 bin/OpenSim.ini.example | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'bin/OpenSim.ini.example')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index eab1fce..e078e86 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -210,13 +210,12 @@
     ;; Choose one of the physics engines below
     ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
-    ;; BulletSim is incomplete and experimental but in active development.  BulletSimN is a purely C# version of BulletSim.
+    ;; BulletSim is experimental and in active development.
     ;; basicphysics effectively does not model physics at all, making all
     ;; objects phantom.   
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
     ; physics = BulletSim
-    ; physics = BulletSimN
     ; physics = basicphysics
     ; physics = POS
 
-- 
cgit v1.1


From fb1211ad5ef86bf6a1b6170775f1ebb4adcb4cb7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 12 Mar 2013 23:01:27 +0000
Subject: Add DisableInterRegionTeleportCancellation option in [EntityTransfer]
 section of OpenSim.ini.  False by default.

This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
---
 bin/OpenSim.ini.example | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'bin/OpenSim.ini.example')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e078e86..ce2e600 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -541,6 +541,13 @@
     ; shout_distance = 100
 
 
+[EntityTransfer]
+    ;# {DisableInterRegionTeleportCancellation} {} {Determine whether the cancel button is shown at all during teleports.} {false true} false
+    ;; This option exists because cancelling at certain points can result in an unuseable session (frozen avatar, etc.)
+    ;; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
+    ;DisableInterRegionTeleportCancellation = false
+
+
 [Messaging]
     ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
     ;; Module to handle offline messaging. The core module requires an external
-- 
cgit v1.1