aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2008-02-01 13:10:40 +0000
committerMW2008-02-01 13:10:40 +0000
commit5099be8072301bab40b2f33a89833cc64c48551a (patch)
tree2990bc1311f423230a2a19f10fb9e9c299681427 /OpenSim/Region
parent* Committing random physics stuff to the SVN for use later (diff)
downloadopensim-SC_OLD-5099be8072301bab40b2f33a89833cc64c48551a.zip
opensim-SC_OLD-5099be8072301bab40b2f33a89833cc64c48551a.tar.gz
opensim-SC_OLD-5099be8072301bab40b2f33a89833cc64c48551a.tar.bz2
opensim-SC_OLD-5099be8072301bab40b2f33a89833cc64c48551a.tar.xz
Temporary try catch around calculateSpaceForGeom() , to see if it gets past mantis issue #435 (for now)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index d25b8c0..7a38d0e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -873,10 +873,17 @@ namespace OpenSim.Region.Physics.OdePlugin
873 /// <returns>a pointer to the space. This could be a new space or reused space.</returns> 873 /// <returns>a pointer to the space. This could be a new space or reused space.</returns>
874 public IntPtr calculateSpaceForGeom(PhysicsVector pos) 874 public IntPtr calculateSpaceForGeom(PhysicsVector pos)
875 { 875 {
876 int[] xyspace = calculateSpaceArrayItemFromPos(pos); 876 IntPtr locationbasedspace =IntPtr.Zero;
877 //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); 877 try
878 IntPtr locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; 878 {
879 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
880 //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
881 locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]];
882 }
883 catch (Exception)
884 {
879 885
886 }
880 //locationbasedspace = space; 887 //locationbasedspace = space;
881 return locationbasedspace; 888 return locationbasedspace;
882 } 889 }