aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-10-07 06:33:13 +0100
committerUbitUmarov2012-10-07 06:33:13 +0100
commita0b4e68060b51deba6262b0c81873ce734cb0089 (patch)
treed9082d8ef9e44c99cfeaaeabffa5f6f4f45cd686 /OpenSim
parent fix wrong file commited (diff)
downloadopensim-SC_OLD-a0b4e68060b51deba6262b0c81873ce734cb0089.zip
opensim-SC_OLD-a0b4e68060b51deba6262b0c81873ce734cb0089.tar.gz
opensim-SC_OLD-a0b4e68060b51deba6262b0c81873ce734cb0089.tar.bz2
opensim-SC_OLD-a0b4e68060b51deba6262b0c81873ce734cb0089.tar.xz
refix so we can compile it, loosing alpha scultps fix on core meshmerizer
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 236adb0..b462713 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -702,6 +702,10 @@ 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)
706 {
707 return CreateMesh(primName, primShape, size, lod, false);
708 }
705 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) 709 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
706 { 710 {
707#if SPAM 711#if SPAM
@@ -743,5 +747,12 @@ namespace OpenSim.Region.Physics.Meshing
743 747
744 return mesh; 748 return mesh;
745 } 749 }
750 public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
751 {
752 return null;
753 }
754
755 public void ReleaseMesh(IMesh imesh) { }
756 public void ExpireReleaseMeshs() { }
746 } 757 }
747} 758}