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/BulletXPlugin/BulletXPlugin.cs | |
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 'OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 4f1afdd..8f5ffd8 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -212,11 +212,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
212 | return true; | 212 | return true; |
213 | } | 213 | } |
214 | 214 | ||
215 | public PhysicsScene GetScene() | 215 | public PhysicsScene GetScene(string sceneIdentifier) |
216 | { | 216 | { |
217 | if (_mScene == null) | 217 | if (_mScene == null) |
218 | { | 218 | { |
219 | _mScene = new BulletXScene(); | 219 | _mScene = new BulletXScene(sceneIdentifier); |
220 | } | 220 | } |
221 | return (_mScene); | 221 | return (_mScene); |
222 | } | 222 | } |
@@ -493,6 +493,12 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
493 | public IMesher mesher; | 493 | public IMesher mesher; |
494 | // private IConfigSource m_config; | 494 | // private IConfigSource m_config; |
495 | 495 | ||
496 | String identifier; | ||
497 | |||
498 | public BulletXScene(String sceneIdentifier) | ||
499 | { | ||
500 | identifier = sceneIdentifier; | ||
501 | } | ||
496 | 502 | ||
497 | public static float Gravity | 503 | public static float Gravity |
498 | { | 504 | { |