From d644b1f440b36f5b0f492ad085f3fbac0e7920ad Mon Sep 17 00:00:00 2001 From: dan miller Date: Mon, 1 Oct 2007 16:01:42 +0000 Subject: this should fix mantis 452 and related -- hollow prims work in Linux! (I hope) --- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 3 ++- bin/Ode.NET.dll | Bin 57344 -> 61440 bytes bin/OpenSim.ini | 4 ++-- 3 files changed, 4 insertions(+), 3 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 public string GetName() { + d.bug(); return ("OpenDynamicsEngine"); } @@ -639,7 +640,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomTriMeshDataBuildSimple(_triMeshData, vertexList, 3 * sizeof(float), VertexCount, indexList, IndexCount, 3 * sizeof(int)); d.GeomTriMeshDataPreprocess(_triMeshData); - prim_geom = d.CreateTriMesh(parent_scene.space, _triMeshData, parent_scene.triCallback, parent_scene.triArrayCallback, null); + prim_geom = d.CreateTriMesh(parent_scene.space, _triMeshData, parent_scene.triCallback, null, null); } public override bool Flying diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll index 40f15a5..5c1e09f 100644 Binary files a/bin/Ode.NET.dll and b/bin/Ode.NET.dll differ diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini index f4efeb5..89f7d83 100644 --- a/bin/OpenSim.ini +++ b/bin/OpenSim.ini @@ -4,8 +4,8 @@ physics = basicphysics ; Prim Storage ; if you would like to use sqlite uncomment the following line (and ; comment the NullStorage line) -storage_plugin = "OpenSim.DataStore.MonoSqlite.dll" -;storage_plugin = "OpenSim.DataStore.NullStorage.dll" +;storage_plugin = "OpenSim.DataStore.MonoSqlite.dll" +storage_plugin = "OpenSim.DataStore.NullStorage.dll" startup_console_commands_file = "startup_commands.txt" serverside_object_permissions = false -- cgit v1.1