Merge branch 'master' into careminster

3 files changed, 3 insertions, 2 deletions

diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
new file mode 100644
index 0000000..1e3f042
--- /dev/null
+++ b/bin/BulletXNA.dll
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
new file mode 100644
index 0000000..4b83b83
--- /dev/null
+++ b/bin/BulletXNA.pdb
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6757081..f3e4f6c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -206,12 +206,13 @@
     ;; 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
+    ;; BulletSim is incomplete and experimental but in active development.  BulletSimN is a purely C# version of BulletSim.
     ;; basicphysics effectively does not model physics at all, making all
-    ;; objects phantom
+    ;; objects phantom.   
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
     ; physics = BulletSim
+    ; physics = BulletSimN
     ; physics = basicphysics
     ; physics = POS