aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/ZeroMesher.cs
diff options
context:
space:
mode:
authorMelanie2012-03-20 23:09:34 +0100
committerMelanie2012-03-20 23:09:34 +0100
commit3d258d26885bcb4a802adb3971acd8ec15dfc21e (patch)
treec44b65a0307369d9a60fa0c2e6e685cb450ae093 /OpenSim/Region/Physics/Manager/ZeroMesher.cs
parentMerge branch 'master' into careminster (diff)
parentlet convex be a parameter to createMesh so it can be used. Was forced to add ... (diff)
downloadopensim-SC_OLD-3d258d26885bcb4a802adb3971acd8ec15dfc21e.zip
opensim-SC_OLD-3d258d26885bcb4a802adb3971acd8ec15dfc21e.tar.gz
opensim-SC_OLD-3d258d26885bcb4a802adb3971acd8ec15dfc21e.tar.bz2
opensim-SC_OLD-3d258d26885bcb4a802adb3971acd8ec15dfc21e.tar.xz
Merge branch 'ubitwork'
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Manager/ZeroMesher.cs5
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