diff options
author | Justin Clarke Casey | 2008-12-15 18:39:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-15 18:39:54 +0000 |
commit | 3b0db66b92a9e497d965d2a26c9d6de643612b63 (patch) | |
tree | 3452afd22484b8baad138a3ecc5469ea57c8427f /OpenSim/Region/Physics/Manager | |
parent | * minor: Stop presence child status suffering an NRE if the agent uuid given ... (diff) | |
download | opensim-SC-3b0db66b92a9e497d965d2a26c9d6de643612b63.zip opensim-SC-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.gz opensim-SC-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.bz2 opensim-SC-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=2775 with small tweaks
* This pushes an identifier for the OpenSim scene to the physics scene. This allows log messages from the physics scene to identify which OpenSim scene they relate to.
* Thanks Gerhard
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 428a586..4ab8d44 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Physics.Manager | |||
65 | /// <param name="meshEngineName"></param> | 65 | /// <param name="meshEngineName"></param> |
66 | /// <param name="config"></param> | 66 | /// <param name="config"></param> |
67 | /// <returns></returns> | 67 | /// <returns></returns> |
68 | public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config) | 68 | public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config, string regionName) |
69 | { | 69 | { |
70 | if (String.IsNullOrEmpty(physEngineName)) | 70 | if (String.IsNullOrEmpty(physEngineName)) |
71 | { | 71 | { |
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.Manager | |||
92 | if (_PhysPlugins.ContainsKey(physEngineName)) | 92 | if (_PhysPlugins.ContainsKey(physEngineName)) |
93 | { | 93 | { |
94 | m_log.Info("[PHYSICS]: creating " + physEngineName); | 94 | m_log.Info("[PHYSICS]: creating " + physEngineName); |
95 | PhysicsScene result = _PhysPlugins[physEngineName].GetScene(); | 95 | PhysicsScene result = _PhysPlugins[physEngineName].GetScene(regionName); |
96 | result.Initialise(meshEngine, config); | 96 | result.Initialise(meshEngine, config); |
97 | return result; | 97 | return result; |
98 | } | 98 | } |
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Physics.Manager | |||
226 | public interface IPhysicsPlugin | 226 | public interface IPhysicsPlugin |
227 | { | 227 | { |
228 | bool Init(); | 228 | bool Init(); |
229 | PhysicsScene GetScene(); | 229 | PhysicsScene GetScene(String sceneIdentifier); |
230 | string GetName(); | 230 | string GetName(); |
231 | void Dispose(); | 231 | void Dispose(); |
232 | } | 232 | } |