diff options
| author | Teravus Ovares | 2008-01-19 22:51:16 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-01-19 22:51:16 +0000 |
| commit | 4f9c7288cd7ad2967d8f8bb8514dfcf166133474 (patch) | |
| tree | 9e0b43fd1efa9e8a8633f9af25bc1eba0178db2c /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
| parent | Most is back in its original state :) Hope I didn't break anything... *looks ... (diff) | |
| download | opensim-SC_OLD-4f9c7288cd7ad2967d8f8bb8514dfcf166133474.zip opensim-SC_OLD-4f9c7288cd7ad2967d8f8bb8514dfcf166133474.tar.gz opensim-SC_OLD-4f9c7288cd7ad2967d8f8bb8514dfcf166133474.tar.bz2 opensim-SC_OLD-4f9c7288cd7ad2967d8f8bb8514dfcf166133474.tar.xz | |
* Announcing the alternative prim early adoption program.. Adding regular spheres to the physical prim mix.
* Be advised.. these are not ellipsoids.. these are spheres.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 41e195b..0563992 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -338,7 +338,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 338 | { | 338 | { |
| 339 | //This is disabled at the moment only because it needs more tweaking | 339 | //This is disabled at the moment only because it needs more tweaking |
| 340 | //It will eventually be uncommented | 340 | //It will eventually be uncommented |
| 341 | 341 | /* | |
| 342 | if (contacts[i].depth >= 1.00f) | 342 | if (contacts[i].depth >= 1.00f) |
| 343 | { | 343 | { |
| 344 | //MainLog.Instance.Debug("PHYSICS",contacts[i].depth.ToString()); | 344 | //MainLog.Instance.Debug("PHYSICS",contacts[i].depth.ToString()); |
| @@ -381,7 +381,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 381 | //contacts[i].depth = 0.0000000f; | 381 | //contacts[i].depth = 0.0000000f; |
| 382 | } | 382 | } |
| 383 | } | 383 | } |
| 384 | 384 | */ | |
| 385 | 385 | ||
| 386 | // If you interpenetrate a prim with another prim | 386 | // If you interpenetrate a prim with another prim |
| 387 | if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim) | 387 | if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim) |