Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

5 files changed, 24 insertions, 23 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9c32abd..6e6a089 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -936,10 +936,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
@@ -1037,30 +1037,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
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