diff options
| author | UbitUmarov | 2012-05-21 17:11:19 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-05-21 17:11:19 +0100 |
| commit | d2260423e5e955b4e0f33f279e64cf74d580dc37 (patch) | |
| tree | 6db2749837f558eaa11335c97f65d0ee7eaee20a /OpenSim | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| download | opensim-SC-d2260423e5e955b4e0f33f279e64cf74d580dc37.zip opensim-SC-d2260423e5e955b4e0f33f279e64cf74d580dc37.tar.gz opensim-SC-d2260423e5e955b4e0f33f279e64cf74d580dc37.tar.bz2 opensim-SC-d2260423e5e955b4e0f33f279e64cf74d580dc37.tar.xz | |
also don't collide sculps or meshs if meshing is OFF
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 459cd27..496e7ac 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
| @@ -1482,6 +1482,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1482 | if (!haveMesh) | 1482 | if (!haveMesh) |
| 1483 | m_NoColide = true; | 1483 | m_NoColide = true; |
| 1484 | } | 1484 | } |
| 1485 | else if(_pbs.SculptEntry) | ||
| 1486 | m_NoColide = true; // also don't colide if is a sculp or mesh and meshing is off | ||
| 1485 | 1487 | ||
| 1486 | if (!haveMesh) | 1488 | if (!haveMesh) |
| 1487 | { | 1489 | { |