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/POSPlugin | |
parent | * minor: Stop presence child status suffering an NRE if the agent uuid given ... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSScene.cs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs index c8cbcf5..04e3e75 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | |||
@@ -47,9 +47,9 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
47 | return true; | 47 | return true; |
48 | } | 48 | } |
49 | 49 | ||
50 | public PhysicsScene GetScene() | 50 | public PhysicsScene GetScene(string sceneIdentifier) |
51 | { | 51 | { |
52 | return new POSScene(); | 52 | return new POSScene(sceneIdentifier); |
53 | } | 53 | } |
54 | 54 | ||
55 | public string GetName() | 55 | public string GetName() |
diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/Physics/POSPlugin/POSScene.cs index 9a4e92f..43af72d 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSScene.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSScene.cs | |||
@@ -41,8 +41,11 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
41 | private float[] _heightMap; | 41 | private float[] _heightMap; |
42 | private const float gravity = -9.8f; | 42 | private const float gravity = -9.8f; |
43 | 43 | ||
44 | public POSScene() | 44 | string sceneIdentifier; |
45 | |||
46 | public POSScene(String _sceneIdentifier) | ||
45 | { | 47 | { |
48 | sceneIdentifier = _sceneIdentifier; | ||
46 | } | 49 | } |
47 | 50 | ||
48 | public override void Initialise(IMesher meshmerizer, IConfigSource config) | 51 | public override void Initialise(IMesher meshmerizer, IConfigSource config) |