diff options
| author | Melanie | 2010-10-02 19:51:43 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-02 19:51:43 +0100 |
| commit | fd56fd2ce8884047885724a2f89df47398136db0 (patch) | |
| tree | e0b6efa594c4d30315e8afa0b1a41e84975f16ad /OpenSim/Region/Physics | |
| parent | Replace CalculateMass with a more accurate version, contributed by Ubit. (diff) | |
| parent | Reapplying the parts of the prior revert that were not derived from the (diff) | |
| download | opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.zip opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.tar.gz opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.tar.bz2 opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 319a951..f33b5b9 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -572,8 +572,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 572 | break; | 572 | break; |
| 573 | 573 | ||
| 574 | case HollowShape.Circle: | 574 | case HollowShape.Circle: |
| 575 | // Hollow shape is a perfect cyllinder in respect to the cube's scale | 575 | // Hollow shape is a perfect cylinder in respect to the cube's scale |
| 576 | // Cyllinder hollow volume calculation | 576 | // Cylinder hollow volume calculation |
| 577 | 577 | ||
| 578 | hollowVolume *= 0.1963495f * 3.07920140172638f; | 578 | hollowVolume *= 0.1963495f * 3.07920140172638f; |
| 579 | break; | 579 | break; |