diff options
author | Teravus Ovares | 2008-12-14 07:29:40 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-12-14 07:29:40 +0000 |
commit | b5dec9a37f204ddc970cfa90e7ebef53114f4dcf (patch) | |
tree | 0858f14712bf8807d6e9041c5de105e12dea9010 | |
parent | * A Few physical prim + linkset fixes. Prevent some crashes (diff) | |
download | opensim-SC_OLD-b5dec9a37f204ddc970cfa90e7ebef53114f4dcf.zip opensim-SC_OLD-b5dec9a37f204ddc970cfa90e7ebef53114f4dcf.tar.gz opensim-SC_OLD-b5dec9a37f204ddc970cfa90e7ebef53114f4dcf.tar.bz2 opensim-SC_OLD-b5dec9a37f204ddc970cfa90e7ebef53114f4dcf.tar.xz |
* Added Avatar minimum size in the ODEPlugin and a stern warning about setting the capsule size too low in OpenSim.ini
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 666fa86..de09691 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -419,8 +419,23 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
419 | // place that is safe to call this routine AvatarGeomAndBodyCreation. | 419 | // place that is safe to call this routine AvatarGeomAndBodyCreation. |
420 | private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor) | 420 | private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor) |
421 | { | 421 | { |
422 | //CAPSULE_LENGTH = -5; | ||
423 | //CAPSULE_RADIUS = -5; | ||
422 | int dAMotorEuler = 1; | 424 | int dAMotorEuler = 1; |
423 | _parent_scene.waitForSpaceUnlock(_parent_scene.space); | 425 | _parent_scene.waitForSpaceUnlock(_parent_scene.space); |
426 | if (CAPSULE_LENGTH <= 0) | ||
427 | { | ||
428 | m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!"); | ||
429 | CAPSULE_LENGTH = 0.01f; | ||
430 | |||
431 | } | ||
432 | |||
433 | if (CAPSULE_RADIUS <= 0) | ||
434 | { | ||
435 | m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!"); | ||
436 | CAPSULE_RADIUS = 0.01f; | ||
437 | |||
438 | } | ||
424 | Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH); | 439 | Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH); |
425 | 440 | ||
426 | d.GeomSetCategoryBits(Shell, (int)m_collisionCategories); | 441 | d.GeomSetCategoryBits(Shell, (int)m_collisionCategories); |