From 3b0db66b92a9e497d965d2a26c9d6de643612b63 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 15 Dec 2008 18:39:54 +0000
Subject: * 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
---
OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Physics/Manager')
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
///
///
///
- public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config)
+ public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config, string regionName)
{
if (String.IsNullOrEmpty(physEngineName))
{
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.Manager
if (_PhysPlugins.ContainsKey(physEngineName))
{
m_log.Info("[PHYSICS]: creating " + physEngineName);
- PhysicsScene result = _PhysPlugins[physEngineName].GetScene();
+ PhysicsScene result = _PhysPlugins[physEngineName].GetScene(regionName);
result.Initialise(meshEngine, config);
return result;
}
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Physics.Manager
public interface IPhysicsPlugin
{
bool Init();
- PhysicsScene GetScene();
+ PhysicsScene GetScene(String sceneIdentifier);
string GetName();
void Dispose();
}
--
cgit v1.1