aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
diff options
context:
space:
mode:
authorubit2012-10-09 05:32:58 +0200
committerubit2012-10-09 05:32:58 +0200
commitd35a0b63e2e069bb13295c915f94d2e51cd464a5 (patch)
tree9da16c57ee32202c17c4339102f8ac89511fb039 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent force allocation of mesh data on creation ( messy code version ) (diff)
downloadopensim-SC-d35a0b63e2e069bb13295c915f94d2e51cd464a5.zip
opensim-SC-d35a0b63e2e069bb13295c915f94d2e51cd464a5.tar.gz
opensim-SC-d35a0b63e2e069bb13295c915f94d2e51cd464a5.tar.bz2
opensim-SC-d35a0b63e2e069bb13295c915f94d2e51cd464a5.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index b462713..fd4ac7f 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -702,10 +702,11 @@ namespace OpenSim.Region.Physics.Meshing
702 return CreateMesh(primName, primShape, size, lod, false); 702 return CreateMesh(primName, primShape, size, lod, false);
703 } 703 }
704 704
705 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex) 705 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde)
706 { 706 {
707 return CreateMesh(primName, primShape, size, lod, false); 707 return CreateMesh(primName, primShape, size, lod, false);
708 } 708 }
709
709 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) 710 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
710 { 711 {
711#if SPAM 712#if SPAM