diff options
author | UbitUmarov | 2016-07-04 08:55:19 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-04 08:55:19 +0100 |
commit | 2ebccbcd087aae4bd2273958fac7a4bbf9a3f2a7 (patch) | |
tree | 758f9a3d83a48f00a75a65239293abeddf458878 | |
parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-2ebccbcd087aae4bd2273958fac7a4bbf9a3f2a7.zip opensim-SC-2ebccbcd087aae4bd2273958fac7a4bbf9a3f2a7.tar.gz opensim-SC-2ebccbcd087aae4bd2273958fac7a4bbf9a3f2a7.tar.bz2 opensim-SC-2ebccbcd087aae4bd2273958fac7a4bbf9a3f2a7.tar.xz |
add EngineName also to old ODE
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/ODEModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs b/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs index ed50de3..d61ee61 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEModule.cs | |||
@@ -25,6 +25,11 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
25 | get { return "OpenDynamicsEngine"; } | 25 | get { return "OpenDynamicsEngine"; } |
26 | } | 26 | } |
27 | 27 | ||
28 | public string Version | ||
29 | { | ||
30 | get { return "1.0"; } | ||
31 | } | ||
32 | |||
28 | public Type ReplaceableInterface | 33 | public Type ReplaceableInterface |
29 | { | 34 | { |
30 | get { return null; } | 35 | get { return null; } |
@@ -60,7 +65,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
60 | // http://opensimulator.org/mantis/view.php?id=2750). | 65 | // http://opensimulator.org/mantis/view.php?id=2750). |
61 | d.InitODE(); | 66 | d.InitODE(); |
62 | 67 | ||
63 | m_scene = new OdeScene(scene, m_config, Name); | 68 | m_scene = new OdeScene(scene, m_config, Name, Version); |
64 | } | 69 | } |
65 | 70 | ||
66 | public void RemoveRegion(Scene scene) | 71 | public void RemoveRegion(Scene scene) |
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index e23cca6..8f9bccb 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | |||
@@ -500,13 +500,14 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
500 | 500 | ||
501 | public Scene m_frameWorkScene = null; | 501 | public Scene m_frameWorkScene = null; |
502 | 502 | ||
503 | public OdeScene(Scene pscene, IConfigSource psourceconfig, string pname) | 503 | public OdeScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion) |
504 | { | 504 | { |
505 | m_config = psourceconfig; | 505 | m_config = psourceconfig; |
506 | m_frameWorkScene = pscene; | 506 | m_frameWorkScene = pscene; |
507 | 507 | ||
508 | EngineType = pname; | 508 | EngineType = pname; |
509 | PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName; | 509 | PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName; |
510 | EngineName = pname + " " + pversion; | ||
510 | 511 | ||
511 | pscene.RegisterModuleInterface<PhysicsScene>(this); | 512 | pscene.RegisterModuleInterface<PhysicsScene>(this); |
512 | Vector3 extent = new Vector3(pscene.RegionInfo.RegionSizeX, pscene.RegionInfo.RegionSizeY, pscene.RegionInfo.RegionSizeZ); | 513 | Vector3 extent = new Vector3(pscene.RegionInfo.RegionSizeX, pscene.RegionInfo.RegionSizeY, pscene.RegionInfo.RegionSizeZ); |