aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing/Meshmerizer.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/Meshing/Meshmerizer.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 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 79e50d2..75fa1ef 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -717,6 +717,11 @@ namespace OpenSim.Region.Physics.Meshing
717 return CreateMesh(primName, primShape, size, lod, false); 717 return CreateMesh(primName, primShape, size, lod, false);
718 } 718 }
719 719
720 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
721 {
722 return CreateMesh(primName, primShape, size, lod, false);
723 }
724
720 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) 725 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
721 { 726 {
722#if SPAM 727#if SPAM