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

* ODE:Fix copy and paste bug in space calculation limits

ThreadPoolClientBranch
Teravus Ovares 2008-02-01 14:05:22 +00:00
parent 5099be8072
commit 96f6add4ad
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,16 +874,11 @@ namespace OpenSim.Region.Physics.OdePlugin
public IntPtr calculateSpaceForGeom(PhysicsVector pos) public IntPtr calculateSpaceForGeom(PhysicsVector pos)
{ {
IntPtr locationbasedspace =IntPtr.Zero; IntPtr locationbasedspace =IntPtr.Zero;
try
{
int[] xyspace = calculateSpaceArrayItemFromPos(pos); int[] xyspace = calculateSpaceArrayItemFromPos(pos);
//MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]];
}
catch (Exception)
{
}
//locationbasedspace = space; //locationbasedspace = space;
return locationbasedspace; return locationbasedspace;
} }
@ -905,10 +900,11 @@ namespace OpenSim.Region.Physics.OdePlugin
returnint[0] = 0; returnint[0] = 0;
returnint[1] = (int) (pos.Y/metersInSpace); returnint[1] = (int) (pos.Y/metersInSpace);
if (returnint[0] > ((int) (259f/metersInSpace))) if (returnint[1] > ((int) (259f/metersInSpace)))
returnint[0] = ((int) (259f/metersInSpace)); returnint[1] = ((int) (259f/metersInSpace));
if (returnint[0] < 0) if (returnint[1] < 0)
returnint[0] = 0; returnint[1] = 0;
return returnint; return returnint;
} }