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

* Removes the console enumeration errors on sim start.

afrisby
Teravus Ovares 2007-11-14 16:12:59 +00:00
parent ccd08ae3d0
commit cb6ec3d0f7
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -404,10 +404,13 @@ namespace OpenSim.Region.Physics.OdePlugin
public void remActivePrim(OdePrim deactivatePrim) public void remActivePrim(OdePrim deactivatePrim)
{ {
lock (OdeLock) lock (OdeLock)
{
lock (_activeprims)
{ {
_activeprims.Remove(deactivatePrim); _activeprims.Remove(deactivatePrim);
} }
} }
}
public int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount) public int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount)
{ {
/* String name1 = null; /* String name1 = null;
@ -1174,7 +1177,12 @@ namespace OpenSim.Region.Physics.OdePlugin
_mesh = mesh; _mesh = mesh;
_pbs = pbs; _pbs = pbs;
_parent_scene = parent_scene; _parent_scene = parent_scene;
if (pos.Z < 0)
m_isphysical = false;
else
m_isphysical = pisPhysical; m_isphysical = pisPhysical;
m_primName = primName; m_primName = primName;
@ -1581,7 +1589,8 @@ namespace OpenSim.Region.Physics.OdePlugin
// Sim resources and memory. // Sim resources and memory.
// Disables the prim's movement physics.... // Disables the prim's movement physics....
// It's a hack and will generate a console message if it fails. // It's a hack and will generate a console message if it fails.
lock (OdeScene.OdeLock)
{
try try
{ {
disableBody(); disableBody();
@ -1596,6 +1605,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
}
IsPhysical = false; IsPhysical = false;
_velocity.X = 0; _velocity.X = 0;