aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2012-10-07 06:16:47 +0100
committerUbitUmarov2012-10-07 06:16:47 +0100
commitc42df1259fa02aea21817749d65a4e468166c022 (patch)
tree45a6895a79e9814b7a88e3c9ee58616858598f24
parentMerge branch 'avination' into ubitwork (diff)
downloadopensim-SC_OLD-c42df1259fa02aea21817749d65a4e468166c022.zip
opensim-SC_OLD-c42df1259fa02aea21817749d65a4e468166c022.tar.gz
opensim-SC_OLD-c42df1259fa02aea21817749d65a4e468166c022.tar.bz2
opensim-SC_OLD-c42df1259fa02aea21817749d65a4e468166c022.tar.xz
fix wrong file commited
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 7a3f343..236adb0 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -743,15 +743,5 @@ namespace OpenSim.Region.Physics.Meshing
743 743
744 return mesh; 744 return mesh;
745 } 745 }
746<<<<<<< HEAD
747 public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
748 {
749 return null;
750 }
751
752 public void ReleaseMesh(IMesh imesh) { }
753 public void ExpireReleaseMeshs() { }
754=======
755>>>>>>> avination
756 } 746 }
757} 747}