aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordan miller2007-10-01 16:01:42 +0000
committerdan miller2007-10-01 16:01:42 +0000
commitd644b1f440b36f5b0f492ad085f3fbac0e7920ad (patch)
tree688ede8dda01230e826f4c7dfaa49cbdf0959216 /OpenSim
parentrevert working getInventoryFolder function because this seems (diff)
downloadopensim-SC_OLD-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.zip
opensim-SC_OLD-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.tar.gz
opensim-SC_OLD-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.tar.bz2
opensim-SC_OLD-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.tar.xz
this should fix mantis 452 and related -- hollow prims work in Linux! (I hope)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index e7592fb..1594490 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -69,6 +69,7 @@ namespace OpenSim.Region.Physics.OdePlugin
69 69
70 public string GetName() 70 public string GetName()
71 { 71 {
72 d.bug();
72 return ("OpenDynamicsEngine"); 73 return ("OpenDynamicsEngine");
73 } 74 }
74 75
@@ -639,7 +640,7 @@ namespace OpenSim.Region.Physics.OdePlugin
639 d.GeomTriMeshDataBuildSimple(_triMeshData, vertexList, 3 * sizeof(float), VertexCount, indexList, IndexCount, 3 * sizeof(int)); 640 d.GeomTriMeshDataBuildSimple(_triMeshData, vertexList, 3 * sizeof(float), VertexCount, indexList, IndexCount, 3 * sizeof(int));
640 d.GeomTriMeshDataPreprocess(_triMeshData); 641 d.GeomTriMeshDataPreprocess(_triMeshData);
641 642
642 prim_geom = d.CreateTriMesh(parent_scene.space, _triMeshData, parent_scene.triCallback, parent_scene.triArrayCallback, null); 643 prim_geom = d.CreateTriMesh(parent_scene.space, _triMeshData, parent_scene.triCallback, null, null);
643 } 644 }
644 645
645 public override bool Flying 646 public override bool Flying