aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
-rw-r--r--OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs7
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs6
3 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
index 8623891..65d8867 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
@@ -112,6 +112,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
112 /// </summary> 112 /// </summary>
113 public string EngineType { get; protected set; } 113 public string EngineType { get; protected set; }
114 114
115 public string EngineName { get; protected set; }
116
115 // The only thing that should register for this event is the SceneGraph 117 // The only thing that should register for this event is the SceneGraph
116 // Anything else could cause problems. 118 // Anything else could cause problems.
117 public event physicsCrash OnPhysicsCrash; 119 public event physicsCrash OnPhysicsCrash;
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
index dd1c0ab..51b8e4e 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
@@ -29,6 +29,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
29 get { return "ubODE"; } 29 get { return "ubODE"; }
30 } 30 }
31 31
32 public string Version
33 {
34 get { return "1.0"; }
35 }
36
32 public Type ReplaceableInterface 37 public Type ReplaceableInterface
33 { 38 {
34 get { return null; } 39 get { return null; }
@@ -75,7 +80,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
75 80
76 if(m_scenes.ContainsKey(scene)) // ??? 81 if(m_scenes.ContainsKey(scene)) // ???
77 return; 82 return;
78 ODEScene newodescene = new ODEScene(scene, m_config, Name, OSOdeLib); 83 ODEScene newodescene = new ODEScene(scene, m_config, Name, Version, OSOdeLib);
79 m_scenes[scene] = newodescene; 84 m_scenes[scene] = newodescene;
80 } 85 }
81 86
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index aec7ec3..e0644e3 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -324,13 +324,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
324 324
325 IConfig physicsconfig = null; 325 IConfig physicsconfig = null;
326 326
327 public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, bool pOSOdeLib) 327 public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion, bool pOSOdeLib)
328 { 328 {
329 OdeLock = new Object(); 329 OdeLock = new Object();
330 330
331 EngineType = pname; 331 EngineType = pname;
332 PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName; 332 PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName;
333 333 EngineName = pname + " " + pversion;
334 m_config = psourceconfig; 334 m_config = psourceconfig;
335 m_OSOdeLib = pOSOdeLib; 335 m_OSOdeLib = pOSOdeLib;
336 336
@@ -355,7 +355,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
355 m_log.ErrorFormat("[ubOde] No mesher. module disabled"); 355 m_log.ErrorFormat("[ubOde] No mesher. module disabled");
356 return; 356 return;
357 } 357 }
358 358
359 m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig); 359 m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig);
360 m_frameWorkScene.PhysicsEnabled = true; 360 m_frameWorkScene.PhysicsEnabled = true;
361 } 361 }