diff options
| author | Melanie | 2012-03-21 00:01:11 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-21 00:01:11 +0000 |
| commit | 117a86276904d8f75e4cea7e9528dd267ca3ea9f (patch) | |
| tree | 467a85e00ef65c0a4bb8dad020e19055f2d39026 /OpenSim/Region/Physics/Manager/ZeroMesher.cs | |
| parent | Move the health monitoring stuff where it will do some good (diff) | |
| parent | Update prebuild (diff) | |
| download | opensim-SC-117a86276904d8f75e4cea7e9528dd267ca3ea9f.zip opensim-SC-117a86276904d8f75e4cea7e9528dd267ca3ea9f.tar.gz opensim-SC-117a86276904d8f75e4cea7e9528dd267ca3ea9f.tar.bz2 opensim-SC-117a86276904d8f75e4cea7e9528dd267ca3ea9f.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/ZeroMesher.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs index ba19db6..8a3b50b 100644 --- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs +++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs | |||
| @@ -67,6 +67,11 @@ namespace OpenSim.Region.Physics.Manager | |||
| 67 | return CreateMesh(primName, primShape, size, lod, false); | 67 | return CreateMesh(primName, primShape, size, lod, false); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex) | ||
| 71 | { | ||
| 72 | return CreateMesh(primName, primShape, size, lod, false); | ||
| 73 | } | ||
| 74 | |||
| 70 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) | 75 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) |
| 71 | { | 76 | { |
| 72 | // Remove the reference to the encoded JPEG2000 data so it can be GCed | 77 | // Remove the reference to the encoded JPEG2000 data so it can be GCed |