diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 0ba64f2..4456fce 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
306 | { | 306 | { |
307 | // Ignore, and skip over. | 307 | // Ignore, and skip over. |
308 | } | 308 | } |
309 | //MainLog.Instance.Verbose("PART", "OFFSET:" + m_offsetPosition, ToString()); | 309 | //m_log.Info("[PART]: OFFSET:" + m_offsetPosition.ToString()); |
310 | } | 310 | } |
311 | } | 311 | } |
312 | 312 | ||
@@ -347,14 +347,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
347 | if (ParentID == 0) | 347 | if (ParentID == 0) |
348 | { | 348 | { |
349 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); | 349 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); |
350 | //MainLog.Instance.Verbose("PART", "RO1:" + PhysActor.Orientation.ToString()); | 350 | //m_log.Info("[PART]: RO1:" + PhysActor.Orientation.ToString()); |
351 | } | 351 | } |
352 | else | 352 | else |
353 | { | 353 | { |
354 | // Child prim we have to calculate it's world rotationwel | 354 | // Child prim we have to calculate it's world rotationwel |
355 | LLQuaternion resultingrotation = GetWorldRotation(); | 355 | LLQuaternion resultingrotation = GetWorldRotation(); |
356 | PhysActor.Orientation = new Quaternion(resultingrotation.W, resultingrotation.X, resultingrotation.Y, resultingrotation.Z); | 356 | PhysActor.Orientation = new Quaternion(resultingrotation.W, resultingrotation.X, resultingrotation.Y, resultingrotation.Z); |
357 | //MainLog.Instance.Verbose("PART", "RO2:" + PhysActor.Orientation.ToString()); | 357 | //m_log.Info("[PART]: RO2:" + PhysActor.Orientation.ToString()); |
358 | } | 358 | } |
359 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); | 359 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
360 | //} | 360 | //} |
@@ -1554,14 +1554,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1554 | // Are we the owner? | 1554 | // Are we the owner? |
1555 | if (AgentID == OwnerID) | 1555 | if (AgentID == OwnerID) |
1556 | { | 1556 | { |
1557 | MainLog.Instance.Verbose("PERMISSIONS", | 1557 | m_log.Info("[PERMISSIONS]: field: " + field.ToString() + ", mask: " + mask.ToString() + " addRemTF: " + |
1558 | "field: " + field.ToString() + ", mask: " + mask.ToString() + " addRemTF: " + | 1558 | addRemTF.ToString()); |
1559 | addRemTF.ToString()); | ||
1560 | 1559 | ||
1561 | //Field 8 = EveryoneMask | 1560 | //Field 8 = EveryoneMask |
1562 | if (field == (byte) 8) | 1561 | if (field == (byte) 8) |
1563 | { | 1562 | { |
1564 | MainLog.Instance.Verbose("PERMISSIONS", "Left over: " + (OwnerMask - EveryoneMask)); | 1563 | m_log.Info("[PERMISSIONS]: Left over: " + (OwnerMask - EveryoneMask)); |
1565 | if (addRemTF == (byte) 0) | 1564 | if (addRemTF == (byte) 0) |
1566 | { | 1565 | { |
1567 | //EveryoneMask = (uint)0; | 1566 | //EveryoneMask = (uint)0; |
@@ -1751,7 +1750,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1751 | 1750 | ||
1752 | public void PhysicsOutOfBounds(PhysicsVector pos) | 1751 | public void PhysicsOutOfBounds(PhysicsVector pos) |
1753 | { | 1752 | { |
1754 | MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); | 1753 | m_log.Info("[PHYSICS]: Physical Object went out of bounds."); |
1755 | RemFlag(LLObject.ObjectFlags.Physics); | 1754 | RemFlag(LLObject.ObjectFlags.Physics); |
1756 | DoPhysicsPropertyUpdate(false, true); | 1755 | DoPhysicsPropertyUpdate(false, true); |
1757 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); | 1756 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |