Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 5 insertions, 6 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0cd411e..c73d104 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -229,14 +229,13 @@
     ;CacheSculptMaps = true
     
     ; Choose one of the physics engines below.
-    ; OpenDynamicsEngine is by some distance the most developed physics engine.
-    ; BulletSim is a high performance, up-and-coming physics engine.
-    ; basicphysics effectively does not model physics at all, making all objects phantom.
-    physics = OpenDynamicsEngine
+    ; BulletSim is a high performance physics engine.  It is the default OpenSimulator physics engine
+    ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before
+    physics = BulletSim
+    ;physics = modified_BulletX
+    ;physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
-    ;physics = modified_BulletX
-    ;physics = BulletSim
 
     ; ##
     ; ## SCRIPT ENGINE