aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-15 18:39:54 +0000
committerJustin Clarke Casey2008-12-15 18:39:54 +0000
commit3b0db66b92a9e497d965d2a26c9d6de643612b63 (patch)
tree3452afd22484b8baad138a3ecc5469ea57c8427f /OpenSim/Region/Environment
parent* minor: Stop presence child status suffering an NRE if the agent uuid given ... (diff)
downloadopensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.zip
opensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.gz
opensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.bz2
opensim-SC_OLD-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/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index 8a06eaa..5212f94 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
71 71
72 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 72 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
73 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); 73 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
74 testScene.PhysicsScene = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource); 74 testScene.PhysicsScene = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test");
75 75
76 return testScene; 76 return testScene;
77 } 77 }