diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODETestClass.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs index 606134a..c913639 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
49 | // Loading Zero Mesher | 49 | // Loading Zero Mesher |
50 | imp = new ZeroMesherPlugin(); | 50 | imp = new ZeroMesherPlugin(); |
51 | // Getting Physics Scene | 51 | // Getting Physics Scene |
52 | ps = cbt.GetScene(); | 52 | ps = cbt.GetScene("test"); |
53 | // Initializing Physics Scene. | 53 | // Initializing Physics Scene. |
54 | ps.Initialise(imp.GetMesher(),null); | 54 | ps.Initialise(imp.GetMesher(),null); |
55 | float[] _heightmap = new float[256 * 256]; | 55 | float[] _heightmap = new float[256 * 256]; |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index b066d0c..d1a3ce7 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
66 | return true; | 66 | return true; |
67 | } | 67 | } |
68 | 68 | ||
69 | public PhysicsScene GetScene() | 69 | public PhysicsScene GetScene(String sceneIdentifier) |
70 | { | 70 | { |
71 | if (_mScene == null) | 71 | if (_mScene == null) |
72 | { | 72 | { |
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
74 | // http://opensimulator.org/mantis/view.php?id=2750). | 74 | // http://opensimulator.org/mantis/view.php?id=2750). |
75 | d.InitODE(); | 75 | d.InitODE(); |
76 | 76 | ||
77 | _mScene = new OdeScene(ode); | 77 | _mScene = new OdeScene(ode, sceneIdentifier); |
78 | } | 78 | } |
79 | return (_mScene); | 79 | return (_mScene); |
80 | } | 80 | } |
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
123 | 123 | ||
124 | public class OdeScene : PhysicsScene | 124 | public class OdeScene : PhysicsScene |
125 | { | 125 | { |
126 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 126 | private ILog m_log; |
127 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); | 127 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); |
128 | 128 | ||
129 | CollisionLocker ode; | 129 | CollisionLocker ode; |
@@ -270,8 +270,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
270 | /// Sets many properties that ODE requires to be stable | 270 | /// Sets many properties that ODE requires to be stable |
271 | /// These settings need to be tweaked 'exactly' right or weird stuff happens. | 271 | /// These settings need to be tweaked 'exactly' right or weird stuff happens. |
272 | /// </summary> | 272 | /// </summary> |
273 | public OdeScene(CollisionLocker dode) | 273 | public OdeScene(CollisionLocker dode, string sceneIdentifier) |
274 | { | 274 | { |
275 | m_log | ||
276 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier); | ||
277 | |||
275 | OdeLock = new Object(); | 278 | OdeLock = new Object(); |
276 | ode = dode; | 279 | ode = dode; |
277 | nearCallback = near; | 280 | nearCallback = near; |