diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 27c22eb..1470191 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
320 | 320 | ||
321 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) | 321 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) |
322 | { | 322 | { |
323 | //System.Console.WriteLine("SceneObjectPart Deserialize BGN"); | 323 | //m_log.Debug("SceneObjectPart Deserialize BGN"); |
324 | m_TextureAnimation = new byte[0]; | 324 | m_TextureAnimation = new byte[0]; |
325 | m_particleSystem = new byte[0]; | 325 | m_particleSystem = new byte[0]; |
326 | if (info == null) | 326 | if (info == null) |
@@ -333,7 +333,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
333 | m_ids = (List<UUID>)info.GetValue("m_ids", typeof(List<UUID>)); | 333 | m_ids = (List<UUID>)info.GetValue("m_ids", typeof(List<UUID>)); |
334 | */ | 334 | */ |
335 | 335 | ||
336 | //System.Console.WriteLine("SceneObjectPart Deserialize END"); | 336 | //m_log.Debug("SceneObjectPart Deserialize END"); |
337 | Rezzed = DateTime.Now; | 337 | Rezzed = DateTime.Now; |
338 | 338 | ||
339 | m_inventory = new SceneObjectPartInventory(this); | 339 | m_inventory = new SceneObjectPartInventory(this); |
@@ -534,7 +534,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
534 | } | 534 | } |
535 | catch (Exception e) | 535 | catch (Exception e) |
536 | { | 536 | { |
537 | Console.WriteLine("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message); | 537 | m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message); |
538 | } | 538 | } |
539 | } | 539 | } |
540 | 540 | ||
@@ -619,7 +619,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
619 | } | 619 | } |
620 | catch (Exception ex) | 620 | catch (Exception ex) |
621 | { | 621 | { |
622 | Console.WriteLine("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message); | 622 | m_log.Error("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message); |
623 | } | 623 | } |
624 | } | 624 | } |
625 | 625 | ||
@@ -1121,13 +1121,13 @@ if (m_shape != null) { | |||
1121 | // PrimFlags prevflag = Flags; | 1121 | // PrimFlags prevflag = Flags; |
1122 | if ((ObjectFlags & (uint) flag) == 0) | 1122 | if ((ObjectFlags & (uint) flag) == 0) |
1123 | { | 1123 | { |
1124 | //Console.WriteLine("Adding flag: " + ((PrimFlags) flag).ToString()); | 1124 | //m_log.Debug("Adding flag: " + ((PrimFlags) flag).ToString()); |
1125 | _flags |= flag; | 1125 | _flags |= flag; |
1126 | 1126 | ||
1127 | if (flag == PrimFlags.TemporaryOnRez) | 1127 | if (flag == PrimFlags.TemporaryOnRez) |
1128 | ResetExpire(); | 1128 | ResetExpire(); |
1129 | } | 1129 | } |
1130 | // System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); | 1130 | // m_log.Debug("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); |
1131 | } | 1131 | } |
1132 | 1132 | ||
1133 | /// <summary> | 1133 | /// <summary> |
@@ -2197,10 +2197,10 @@ if (m_shape != null) { | |||
2197 | // PrimFlags prevflag = Flags; | 2197 | // PrimFlags prevflag = Flags; |
2198 | if ((ObjectFlags & (uint) flag) != 0) | 2198 | if ((ObjectFlags & (uint) flag) != 0) |
2199 | { | 2199 | { |
2200 | //Console.WriteLine("Removing flag: " + ((PrimFlags)flag).ToString()); | 2200 | //m_log.Debug("Removing flag: " + ((PrimFlags)flag).ToString()); |
2201 | _flags &= ~flag; | 2201 | _flags &= ~flag; |
2202 | } | 2202 | } |
2203 | //System.Console.WriteLine("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); | 2203 | //m_log.Debug("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); |
2204 | //ScheduleFullUpdate(); | 2204 | //ScheduleFullUpdate(); |
2205 | } | 2205 | } |
2206 | 2206 | ||
@@ -3552,7 +3552,7 @@ if (m_shape != null) { | |||
3552 | { | 3552 | { |
3553 | RemFlag(PrimFlags.TemporaryOnRez); | 3553 | RemFlag(PrimFlags.TemporaryOnRez); |
3554 | } | 3554 | } |
3555 | // System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); | 3555 | // m_log.Debug("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); |
3556 | 3556 | ||
3557 | ParentGroup.HasGroupChanged = true; | 3557 | ParentGroup.HasGroupChanged = true; |
3558 | ScheduleFullUpdate(); | 3558 | ScheduleFullUpdate(); |