aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2009-10-05 10:31:41 -0700
committerDiva Canto2009-10-05 10:31:41 -0700
commit62ea6b6383329961c820b4109af3ae943823f27b (patch)
tree16b46a5070420584684954878c6778baf753b30a /OpenSim/Region
parentMore debug messages if things go wrong. (diff)
parentminor: remove mono compile warning (diff)
downloadopensim-SC_OLD-62ea6b6383329961c820b4109af3ae943823f27b.zip
opensim-SC_OLD-62ea6b6383329961c820b4109af3ae943823f27b.tar.gz
opensim-SC_OLD-62ea6b6383329961c820b4109af3ae943823f27b.tar.bz2
opensim-SC_OLD-62ea6b6383329961c820b4109af3ae943823f27b.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0769c90..f5ab1de 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -3476,7 +3476,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3476 public override void UnCombine(PhysicsScene pScene) 3476 public override void UnCombine(PhysicsScene pScene)
3477 { 3477 {
3478 IntPtr localGround = IntPtr.Zero; 3478 IntPtr localGround = IntPtr.Zero;
3479 float[] localHeightfield; 3479 //float[] localHeightfield;
3480 bool proceed = false; 3480 bool proceed = false;
3481 List<IntPtr> geomDestroyList = new List<IntPtr>(); 3481 List<IntPtr> geomDestroyList = new List<IntPtr>();
3482 3482
@@ -3771,16 +3771,13 @@ namespace OpenSim.Region.Physics.OdePlugin
3771 sides.Z = 0.5f; 3771 sides.Z = 0.5f;
3772 3772
3773 ds.DrawBox(ref pos, ref R, ref sides); 3773 ds.DrawBox(ref pos, ref R, ref sides);
3774
3775
3776 } 3774 }
3777 } 3775 }
3778 } 3776 }
3779 } 3777 }
3780 3778
3781 public void start(int unused) 3779 public void start(int unused)
3782 { 3780 {
3783
3784 ds.SetViewpoint(ref xyz, ref hpr); 3781 ds.SetViewpoint(ref xyz, ref hpr);
3785 } 3782 }
3786#endif 3783#endif