OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge

avinationmerge
Melanie 2011-10-25 02:55:25 +01:00
parent 2134f23da0 1d4cd76e8a
commit 10dff1da7f
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -279,7 +279,7 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <summary> /// <summary>
/// Used to lock the entire physics scene. Locked during the main part of Simulate() /// Used to lock the entire physics scene. Locked during the main part of Simulate()
/// </summary> /// </summary>
public Object OdeLock; internal Object OdeLock = new Object();
public IMesher mesher; public IMesher mesher;
@ -315,13 +315,11 @@ namespace OpenSim.Region.Physics.OdePlugin
m_log m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier);
OdeLock = new Object();
nearCallback = near; nearCallback = near;
triCallback = TriCallback; triCallback = TriCallback;
triArrayCallback = TriArrayCallback; triArrayCallback = TriArrayCallback;
m_rayCastManager = new ODERayCastRequestManager(this); m_rayCastManager = new ODERayCastRequestManager(this);
lock (OdeLock)
{
// Create the world and the first space // Create the world and the first space
world = d.WorldCreate(); world = d.WorldCreate();
space = d.HashSpaceCreate(IntPtr.Zero); space = d.HashSpaceCreate(IntPtr.Zero);
@ -335,7 +333,6 @@ namespace OpenSim.Region.Physics.OdePlugin
Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization)); Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization));
viewthread.Start(); viewthread.Start();
#endif #endif
}
_watermap = new float[258 * 258]; _watermap = new float[258 * 258];