ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-10-25 02:55:25 +01:00
parent 2134f23da0 1d4cd76e8a
commit 10dff1da7f
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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