diff options
author | teravus | 2012-10-09 10:41:16 -0400 |
---|---|---|
committer | teravus | 2012-10-09 10:41:16 -0400 |
commit | 7e90ea355120c717d1639d817b2b38326a4d5528 (patch) | |
tree | 014025c16f845f2f6b5f13b6c6f79d6dc2921946 | |
parent | Add config option to plant avatar where they are reducing avatar avatar 'push... (diff) | |
download | opensim-SC-7e90ea355120c717d1639d817b2b38326a4d5528.zip opensim-SC-7e90ea355120c717d1639d817b2b38326a4d5528.tar.gz opensim-SC-7e90ea355120c717d1639d817b2b38326a4d5528.tar.bz2 opensim-SC-7e90ea355120c717d1639d817b2b38326a4d5528.tar.xz |
av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 11 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
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 | |||
502 | public bool physics_logging_append_existing_logfile = false; | 502 | public bool physics_logging_append_existing_logfile = false; |
503 | 503 | ||
504 | private bool avplanted = false; | 504 | private bool avplanted = false; |
505 | 505 | private bool av_av_collisions_off = false; | |
506 | 506 | ||
507 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); | 507 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); |
508 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); | 508 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); |
@@ -647,7 +647,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
647 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); | 647 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); |
648 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); | 648 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); |
649 | avplanted = physicsconfig.GetBoolean("av_planted", false); | 649 | avplanted = physicsconfig.GetBoolean("av_planted", false); |
650 | 650 | av_av_collisions_off = physicsconfig.GetBoolean("av_av_collisions_off", false); | |
651 | |||
651 | IsAvCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false); | 652 | IsAvCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false); |
652 | 653 | ||
653 | contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); | 654 | contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); |
@@ -667,6 +668,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
667 | meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f); | 668 | meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f); |
668 | MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f); | 669 | MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f); |
669 | m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false); | 670 | m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false); |
671 | |||
672 | |||
670 | 673 | ||
671 | if (Environment.OSVersion.Platform == PlatformID.Unix) | 674 | if (Environment.OSVersion.Platform == PlatformID.Unix) |
672 | { | 675 | { |
@@ -1313,6 +1316,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1313 | if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect)) | 1316 | if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect)) |
1314 | skipThisContact = true; // No collision on volume detect prims | 1317 | skipThisContact = true; // No collision on volume detect prims |
1315 | 1318 | ||
1319 | if (av_av_collisions_off) | ||
1320 | if ((p1 is OdeCharacter) && (p2 is OdeCharacter)) | ||
1321 | skipThisContact = true; | ||
1322 | |||
1316 | if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect)) | 1323 | if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect)) |
1317 | skipThisContact = true; // No collision on volume detect prims | 1324 | skipThisContact = true; // No collision on volume detect prims |
1318 | 1325 | ||
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 @@ | |||
850 | ; will lock the avatar in place | 850 | ; will lock the avatar in place |
851 | av_planted = false | 851 | av_planted = false |
852 | 852 | ||
853 | ; 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 | ||
854 | av_av_collisions_off = false | ||
855 | |||
853 | ; ## | 856 | ; ## |
854 | ; ## Object options | 857 | ; ## Object options |
855 | ; ## | 858 | ; ## |