diff options
author | Teravus Ovares | 2008-02-01 14:05:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-01 14:05:22 +0000 |
commit | 96f6add4ad5dd332e561dd714de7d2a6ab4640d8 (patch) | |
tree | 62a36307cd145adbdcb60e3a1043d85ea457a15d /OpenSim/Region | |
parent | Temporary try catch around calculateSpaceForGeom() , to see if it gets past m... (diff) | |
download | opensim-SC-96f6add4ad5dd332e561dd714de7d2a6ab4640d8.zip opensim-SC-96f6add4ad5dd332e561dd714de7d2a6ab4640d8.tar.gz opensim-SC-96f6add4ad5dd332e561dd714de7d2a6ab4640d8.tar.bz2 opensim-SC-96f6add4ad5dd332e561dd714de7d2a6ab4640d8.tar.xz |
* ODE:Fix copy and paste bug in space calculation limits
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 18 |
1 files 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 | |||
874 | public IntPtr calculateSpaceForGeom(PhysicsVector pos) | 874 | public IntPtr calculateSpaceForGeom(PhysicsVector pos) |
875 | { | 875 | { |
876 | IntPtr locationbasedspace =IntPtr.Zero; | 876 | IntPtr locationbasedspace =IntPtr.Zero; |
877 | try | 877 | |
878 | { | ||
879 | int[] xyspace = calculateSpaceArrayItemFromPos(pos); | 878 | int[] xyspace = calculateSpaceArrayItemFromPos(pos); |
880 | //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); | 879 | //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); |
881 | locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; | 880 | locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; |
882 | } | 881 | |
883 | catch (Exception) | ||
884 | { | ||
885 | |||
886 | } | ||
887 | //locationbasedspace = space; | 882 | //locationbasedspace = space; |
888 | return locationbasedspace; | 883 | return locationbasedspace; |
889 | } | 884 | } |
@@ -905,10 +900,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
905 | returnint[0] = 0; | 900 | returnint[0] = 0; |
906 | 901 | ||
907 | returnint[1] = (int) (pos.Y/metersInSpace); | 902 | returnint[1] = (int) (pos.Y/metersInSpace); |
908 | if (returnint[0] > ((int) (259f/metersInSpace))) | 903 | if (returnint[1] > ((int) (259f/metersInSpace))) |
909 | returnint[0] = ((int) (259f/metersInSpace)); | 904 | returnint[1] = ((int) (259f/metersInSpace)); |
910 | if (returnint[0] < 0) | 905 | if (returnint[1] < 0) |
911 | returnint[0] = 0; | 906 | returnint[1] = 0; |
907 | |||
912 | 908 | ||
913 | return returnint; | 909 | return returnint; |
914 | } | 910 | } |