2 files changed, 12 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 8421cdf..cbe21e2 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -502,7 +502,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public bool physics_logging_append_existing_logfile = false;
 
         private bool avplanted = false;
-
+        private bool av_av_collisions_off = false;
 
         public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f);
         public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f);
@@ -647,7 +647,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f);
                     avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f);
                     avplanted = physicsconfig.GetBoolean("av_planted", false);
-                    
+                    av_av_collisions_off = physicsconfig.GetBoolean("av_av_collisions_off", false);
+
                     IsAvCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false);
 
                     contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80);
@@ -667,6 +668,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
                     MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
                     m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
+                    
+                    
 
                     if (Environment.OSVersion.Platform == PlatformID.Unix)
                     {
@@ -1313,6 +1316,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect))
                     skipThisContact = true;   // No collision on volume detect prims
 
+                if (av_av_collisions_off)
+                    if ((p1 is OdeCharacter) && (p2 is OdeCharacter))
+                        skipThisContact = true;
+
                 if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect))
                     skipThisContact = true;   // No collision on volume detect prims
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b380a73..2fca6ce 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -850,6 +850,9 @@
     ; will lock the avatar in place
     av_planted = false
 
+    ; No Avatar Avatar Collissions.  This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment
+    av_av_collisions_off = false
+
     ; ##
     ; ## Object options
     ; ##