6 files changed, 24 insertions, 56 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6dbb611..b21a214 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -947,35 +947,6 @@
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
-[TOSModule]
-        ;; Terms of Service module. It requires an external web script. Unless you
-        ;; have that in place, don't enable this module.
-
-    ;# {Enabled} {} {Enable TOS facilities} {true false} false
-    ; Enabled = false
-
-        ;; Should local users be shown the TOS on first login?
-    ;# {ShowToLocalUsers} {} {Show TOS to local users} {true false} false
-    ; ShowToLocalUsers = false
-        ;; Should foreign users be shown the TOS on first HG login?
-    ;# {ShowToForeignUsers} {} {Show TOS to foreign users} {true false} true
-    ; ShowToForeignUsers = true
-
-        ;; Tell the users what this is about
-        ; Message = "Please read and agree to the Terms of Service"
-
-        ;; How much time do the users have to accept the TOS before they get kicked out?
-        ;; (in minutes)
-        ; Timeout = 5
-
-    ;; This page should have Accept/Decline links somewhere
-    ;; that affect the GridUsers table. If you don't have such
-    ;; script in place, don't use the TOSModule. The TOSModule appends this URL
-        ;; with a query ?user={userid}&sid={sessionid}
-    ;# {TOS_URL} {} {The URL for the TOS page} {}
-    TOS_URL = "http://mygrid.com/tos"
-
-
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 109793a..042fd3a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -932,10 +932,10 @@
     MaxPersistantManifoldPoolSize = 0
     ShouldDisableContactPoolDynamicAllocation = False
     ShouldForceUpdateAllAabbs = False
-    ShouldRandomizeSolverOrder = False
-    ShouldSplitSimulationIslands = False
+    ShouldRandomizeSolverOrder = True
+    ShouldSplitSimulationIslands = True
     ShouldEnableFrictionCaching = False
-    NumberOfSolverIterations = 0;   
+    NumberOfSolverIterations = 0   
 
     ; Linkset constraint parameters
     LinkConstraintUseFrameOffset = False
@@ -1033,30 +1033,31 @@
     ;default_appearance = default_appearance.xml 
 
 
-[RestPlugins]
-    ; Change this to true to enable REST Plugins. This must be true if you wish to use
-    ; REST Region or REST Asset and Inventory Plugins
-    enabled = false
-    god_key = SECRET
-    prefix = /admin
+; RestPlugins are not currently operational.
+;[RestPlugins]
+;    ; Change this to true to enable REST Plugins. This must be true if you wish to use
+;    ; REST Region or REST Asset and Inventory Plugins
+;    enabled = false
+;    god_key = SECRET
+;    prefix = /admin
 
 
-[RestRegionPlugin]
-    ; Change this to true to enable the REST Region Plugin
-    enabled = false
+;[RestRegionPlugin]
+;    ; Change this to true to enable the REST Region Plugin
+;    enabled = false
 
 
-[RestHandler]
-    ; Change this to true to enable the REST Asset and Inventory Plugin
-    enabled = false
-    authenticate = true
-    secured = true
-    extended-escape = true
-    realm = OpenSim REST
-    dump-asset = false
-    path-fill = true
-    dump-line-size = 32
-    flush-on-error = true
+;[RestHandler]
+;    ; Change this to true to enable the REST Asset and Inventory Plugin
+;    enabled = false
+;    authenticate = true
+;    secured = true
+;    extended-escape = true
+;    realm = OpenSim REST
+;    dump-asset = false
+;    path-fill = true
+;    dump-line-size = 32
+;    flush-on-error = true
 
 
 ; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
@@ -1624,10 +1625,6 @@
 [Terrain]
     InitialTerrain = "pinhead-island"
 
-[TOSModule]
-    ;; Enable TOS facilities
-    Enabled = false
-
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 3b35a98..da6e31c 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 65eba37..9503cdb 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index f01655b..1782c8e 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 5302e29..06e6ce2 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so