aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordan miller2007-10-01 16:01:42 +0000
committerdan miller2007-10-01 16:01:42 +0000
commitd644b1f440b36f5b0f492ad085f3fbac0e7920ad (patch)
tree688ede8dda01230e826f4c7dfaa49cbdf0959216
parentrevert working getInventoryFolder function because this seems (diff)
downloadopensim-SC-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.zip
opensim-SC-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.tar.gz
opensim-SC-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.tar.bz2
opensim-SC-d644b1f440b36f5b0f492ad085f3fbac0e7920ad.tar.xz
this should fix mantis 452 and related -- hollow prims work in Linux! (I hope)
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
-rw-r--r--bin/Ode.NET.dllbin57344 -> 61440 bytes
-rw-r--r--bin/OpenSim.ini4
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
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
diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll
index 40f15a5..5c1e09f 100644
--- a/bin/Ode.NET.dll
+++ b/bin/Ode.NET.dll
Binary files 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
4; Prim Storage 4; Prim Storage
5; if you would like to use sqlite uncomment the following line (and 5; if you would like to use sqlite uncomment the following line (and
6; comment the NullStorage line) 6; comment the NullStorage line)
7storage_plugin = "OpenSim.DataStore.MonoSqlite.dll" 7;storage_plugin = "OpenSim.DataStore.MonoSqlite.dll"
8;storage_plugin = "OpenSim.DataStore.NullStorage.dll" 8storage_plugin = "OpenSim.DataStore.NullStorage.dll"
9startup_console_commands_file = "startup_commands.txt" 9startup_console_commands_file = "startup_commands.txt"
10serverside_object_permissions = false 10serverside_object_permissions = false
11 11