From 96f6add4ad5dd332e561dd714de7d2a6ab4640d8 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 1 Feb 2008 14:05:22 +0000 Subject: * ODE:Fix copy and paste bug in space calculation limits --- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 7a38d0e..bff2c80 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -874,16 +874,11 @@ namespace OpenSim.Region.Physics.OdePlugin public IntPtr calculateSpaceForGeom(PhysicsVector pos) { IntPtr locationbasedspace =IntPtr.Zero; - try - { + int[] xyspace = calculateSpaceArrayItemFromPos(pos); //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; - } - catch (Exception) - { - - } + //locationbasedspace = space; return locationbasedspace; } @@ -905,10 +900,11 @@ namespace OpenSim.Region.Physics.OdePlugin returnint[0] = 0; returnint[1] = (int) (pos.Y/metersInSpace); - if (returnint[0] > ((int) (259f/metersInSpace))) - returnint[0] = ((int) (259f/metersInSpace)); - if (returnint[0] < 0) - returnint[0] = 0; + if (returnint[1] > ((int) (259f/metersInSpace))) + returnint[1] = ((int) (259f/metersInSpace)); + if (returnint[1] < 0) + returnint[1] = 0; + return returnint; } -- cgit v1.1