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

* 2nd attempt to fix the Spaceborder/copy bug

afrisby
Teravus Ovares 2007-11-18 20:24:51 +00:00
parent b1b9f79a04
commit 3bb4cd51fd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,7 +409,11 @@ namespace OpenSim.Region.Physics.OdePlugin
// If the geometry is in the targetspace, remove it from the target space
if (d.SpaceQuery(((OdePrim)prim).m_targetSpace, ((OdePrim)prim).prim_geom))
{
d.SpaceRemove(((OdePrim)prim).m_targetSpace, ((OdePrim)prim).prim_geom);
if (!(((OdePrim)prim).m_targetSpace.Equals(null)))
{
if (d.GeomIsSpace(((OdePrim)prim).m_targetSpace))
d.SpaceRemove(((OdePrim)prim).m_targetSpace, ((OdePrim)prim).prim_geom);
}
}
@ -466,6 +470,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (!(sGeomIsIn.Equals(null)))
{
if (sGeomIsIn != (IntPtr)0)
if (d.GeomIsSpace(currentspace))
d.SpaceRemove(sGeomIsIn, geom);
}
}