aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 234af00..b09e69e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28//#define USE_DRAWSTUFF 28//#define USE_DRAWSTUFF
29//#define DEBUG
29 30
30using System; 31using System;
31using System.Collections.Generic; 32using System.Collections.Generic;
@@ -1716,7 +1717,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1716 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 1717 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1717 Vector3 size, Quaternion rotation, bool isPhysical) 1718 Vector3 size, Quaternion rotation, bool isPhysical)
1718 { 1719 {
1719// m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName); 1720#if SPAM
1721 m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName);
1722#endif
1720 1723
1721 PhysicsActor result; 1724 PhysicsActor result;
1722 IMesh mesh = null; 1725 IMesh mesh = null;
@@ -2460,7 +2463,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2460 2463
2461 if (pbs.SculptEntry && !meshSculptedPrim) 2464 if (pbs.SculptEntry && !meshSculptedPrim)
2462 { 2465 {
2463#if SPAM 2466#if DEBUG
2464 m_log.Warn("NonMesh"); 2467 m_log.Warn("NonMesh");
2465#endif 2468#endif
2466 return false; 2469 return false;
@@ -2482,7 +2485,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2482 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100 2485 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
2483 && pbs.PathShearX == 0 && pbs.PathShearY == 0) 2486 && pbs.PathShearX == 0 && pbs.PathShearY == 0)
2484 { 2487 {
2485#if SPAM 2488#if DEBUG
2486 m_log.Warn("NonMesh"); 2489 m_log.Warn("NonMesh");
2487#endif 2490#endif
2488 return false; 2491 return false;
@@ -2563,12 +2566,12 @@ namespace OpenSim.Region.Physics.OdePlugin
2563 2566
2564 if (iPropertiesNotSupportedDefault == 0) 2567 if (iPropertiesNotSupportedDefault == 0)
2565 { 2568 {
2566#if SPAM 2569#if DEBUG
2567 m_log.Warn("NonMesh"); 2570 m_log.Warn("NonMesh");
2568#endif 2571#endif
2569 return false; 2572 return false;
2570 } 2573 }
2571#if SPAM 2574#if DEBUG
2572 m_log.Debug("Mesh"); 2575 m_log.Debug("Mesh");
2573#endif 2576#endif
2574 return true; 2577 return true;
@@ -3606,7 +3609,6 @@ namespace OpenSim.Region.Physics.OdePlugin
3606 else 3609 else
3607 { 3610 {
3608 m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); 3611 m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data.");
3609
3610 } 3612 }
3611 } 3613 }
3612 } 3614 }