Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs

1 files changed, 25 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 85f7708..892290e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -904,6 +904,19 @@
 
 [BulletSim]
     ; World parameters
+
+    ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
+    ; bulletxna is a managed C# dll.  They have comparible functionality..   the c++ is much faster.
+
+    BulletEngine = "bulletunmanaged"
+    ; BulletEngine = "bulletxna"
+
+    ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
+    ;  you will want to switch to the heightfield option
+
+    TerrainImplementation = 1
+    ; TerrainImplementation = 0
+
     DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
@@ -955,6 +968,7 @@
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
+    
 
 [RemoteAdmin]
     enabled = false
@@ -1105,6 +1119,17 @@
 
     ;exclude_list=User 1,User 2,User 3
 
+    ;;Shows modal alertbox for entering agent on IRC enabled regions
+    ;;
+    ;; Enable Alert, default = false
+    ;alert_show = false
+    ;;
+    ;; Show IRC serverinfo, default = true
+    ;alert_show_serverinfo = true
+    ;;
+    ;alert_msg_pre = "This region is linked to Irc."
+    ;alert_msg_post = "Everything you say in public chat can be listened."
+
 
 ; The following settings control the progression of daytime
 ; in the Sim.  The defaults are the same as the commented out settings