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/PhysXPlugin | |
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/PhysXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 6502827..a7ee26d 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -51,11 +51,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
51 | return true; | 51 | return true; |
52 | } | 52 | } |
53 | 53 | ||
54 | public PhysicsScene GetScene() | 54 | public PhysicsScene GetScene(string sceneIdentifier) |
55 | { | 55 | { |
56 | if (_mScene == null) | 56 | if (_mScene == null) |
57 | { | 57 | { |
58 | _mScene = new PhysXScene(); | 58 | _mScene = new PhysXScene(sceneIdentifier); |
59 | } | 59 | } |
60 | return (_mScene); | 60 | return (_mScene); |
61 | } | 61 | } |
@@ -78,8 +78,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
78 | private NxPhysicsSDK mySdk; | 78 | private NxPhysicsSDK mySdk; |
79 | private NxScene scene; | 79 | private NxScene scene; |
80 | 80 | ||
81 | public PhysXScene() | 81 | string sceneIdentifier; |
82 | public PhysXScene(string _sceneIdentifier) | ||
82 | { | 83 | { |
84 | sceneIdentifier = _sceneIdentifier; | ||
85 | |||
83 | mySdk = NxPhysicsSDK.CreateSDK(); | 86 | mySdk = NxPhysicsSDK.CreateSDK(); |
84 | Console.WriteLine("Sdk created - now creating scene"); | 87 | Console.WriteLine("Sdk created - now creating scene"); |
85 | scene = mySdk.CreateScene(); | 88 | scene = mySdk.CreateScene(); |