aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-07-04 08:29:26 +0100
committerUbitUmarov2016-07-04 08:29:26 +0100
commitac72598c6bd974c426863262a1c5ac9210bd986c (patch)
treef1b1f42e5572044be5592162681273aee12af888 /OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
parentNew config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff)
downloadopensim-SC_OLD-ac72598c6bd974c426863262a1c5ac9210bd986c.zip
opensim-SC_OLD-ac72598c6bd974c426863262a1c5ac9210bd986c.tar.gz
opensim-SC_OLD-ac72598c6bd974c426863262a1c5ac9210bd986c.tar.bz2
opensim-SC_OLD-ac72598c6bd974c426863262a1c5ac9210bd986c.tar.xz
add OSSL osGetPhysicsEngineName(). this returns a string with name and version. does no permition checks or it whould be less usefull ( only ubOde returns value)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs6
1 files changed, 3 insertions, 3 deletions
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 }