aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
authorJeff Ames2007-12-04 22:14:53 +0000
committerJeff Ames2007-12-04 22:14:53 +0000
commitf195725db447aad7595810a9950f656163bf1c13 (patch)
tree2d62dbd3635b008e9c41c2645fc71a6abbcc0a26 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
parentmade log messages for known unhandled packet types shorter and yellower. add... (diff)
downloadopensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.zip
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.gz
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.bz2
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.xz
keeping opensim safe for children -- made some namespace references less explicit
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs21
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 1e05274..845d4f9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using Axiom.Math; 31using Axiom.Math;
32using Ode.NET; 32using Ode.NET;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console;
34using OpenSim.Region.Physics.Manager; 35using OpenSim.Region.Physics.Manager;
35 36
36//using OpenSim.Region.Physics.OdePlugin.Meshing; 37//using OpenSim.Region.Physics.OdePlugin.Meshing;
@@ -242,7 +243,7 @@ namespace OpenSim.Region.Physics.OdePlugin
242 } 243 }
243 catch (System.Runtime.InteropServices.SEHException) 244 catch (System.Runtime.InteropServices.SEHException)
244 { 245 {
245 OpenSim.Framework.Console.MainLog.Instance.Error("PHYSICS", "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim."); 246 MainLog.Instance.Error("PHYSICS", "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
246 base.TriggerPhysicsBasedRestart(); 247 base.TriggerPhysicsBasedRestart();
247 } 248 }
248 249
@@ -438,7 +439,7 @@ namespace OpenSim.Region.Physics.OdePlugin
438 } 439 }
439 else 440 else
440 { 441 {
441 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString()); 442 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString());
442 } 443 }
443 } 444 }
444 } 445 }
@@ -460,7 +461,7 @@ namespace OpenSim.Region.Physics.OdePlugin
460 } 461 }
461 else 462 else
462 { 463 {
463 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString()); 464 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString());
464 } 465 }
465 } 466 }
466 } 467 }
@@ -508,7 +509,7 @@ namespace OpenSim.Region.Physics.OdePlugin
508 } 509 }
509 else 510 else
510 { 511 {
511 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); 512 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
512 } 513 }
513 } 514 }
514 else 515 else
@@ -523,7 +524,7 @@ namespace OpenSim.Region.Physics.OdePlugin
523 } 524 }
524 else 525 else
525 { 526 {
526 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString()); 527 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString());
527 } 528 }
528 } 529 }
529 } 530 }
@@ -543,7 +544,7 @@ namespace OpenSim.Region.Physics.OdePlugin
543 } 544 }
544 else 545 else
545 { 546 {
546 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); 547 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
547 } 548 }
548 549
549 } 550 }
@@ -561,7 +562,7 @@ namespace OpenSim.Region.Physics.OdePlugin
561 } 562 }
562 else 563 else
563 { 564 {
564 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); 565 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
565 566
566 } 567 }
567 } 568 }
@@ -578,7 +579,7 @@ namespace OpenSim.Region.Physics.OdePlugin
578 } 579 }
579 else 580 else
580 { 581 {
581 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString()); 582 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString());
582 583
583 } 584 }
584 } 585 }
@@ -612,7 +613,7 @@ namespace OpenSim.Region.Physics.OdePlugin
612 public IntPtr calculateSpaceForGeom(PhysicsVector pos) 613 public IntPtr calculateSpaceForGeom(PhysicsVector pos)
613 { 614 {
614 int[] xyspace = calculateSpaceArrayItemFromPos(pos); 615 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
615 //OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); 616 //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
616 IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]]; 617 IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]];
617 618
618 //locationbasedspace = space; 619 //locationbasedspace = space;
@@ -818,7 +819,7 @@ namespace OpenSim.Region.Physics.OdePlugin
818 } 819 }
819 catch (System.StackOverflowException) 820 catch (System.StackOverflowException)
820 { 821 {
821 OpenSim.Framework.Console.MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim."); 822 MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
822 base.TriggerPhysicsBasedRestart(); 823 base.TriggerPhysicsBasedRestart();
823 } 824 }
824 825