aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorCharles Krinke2009-02-22 20:52:55 +0000
committerCharles Krinke2009-02-22 20:52:55 +0000
commit8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch)
tree96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/Framework
parentAllow delivery of object messages gridwide (diff)
downloadopensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs36
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs60
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs4
19 files changed, 100 insertions, 89 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
index 6bfa73b..38eceb1 100644
--- a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
+++ b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
@@ -31,6 +31,8 @@ using System.Collections.Generic;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenMetaverse.StructuredData; 33using OpenMetaverse.StructuredData;
34using log4net;
35using System.Reflection;
34 36
35namespace OpenSim.Region.Framework.Scenes 37namespace OpenSim.Region.Framework.Scenes
36{ 38{
@@ -240,6 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
240 242
241 public class AgentData : IAgentData 243 public class AgentData : IAgentData
242 { 244 {
245 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
243 private UUID m_id; 246 private UUID m_id;
244 public UUID AgentID 247 public UUID AgentID
245 { 248 {
@@ -496,10 +499,10 @@ namespace OpenSim.Region.Framework.Scenes
496 499
497 public void Dump() 500 public void Dump()
498 { 501 {
499 System.Console.WriteLine("------------ AgentData ------------"); 502 m_log.Info("------------ AgentData ------------");
500 System.Console.WriteLine("UUID: " + AgentID); 503 m_log.Info("UUID: " + AgentID);
501 System.Console.WriteLine("Region: " + RegionHandle); 504 m_log.Info("Region: " + RegionHandle);
502 System.Console.WriteLine("Position: " + Position); 505 m_log.Info("Position: " + Position);
503 } 506 }
504 } 507 }
505 508
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 5055e44..fb5c0d1 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Scenes
150 150
151 protected EntityBase(SerializationInfo info, StreamingContext context) 151 protected EntityBase(SerializationInfo info, StreamingContext context)
152 { 152 {
153 //System.Console.WriteLine("EntityBase Deserialize BGN"); 153 //m_log.Debug("EntityBase Deserialize BGN");
154 154
155 if (info == null) 155 if (info == null)
156 { 156 {
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes
187 187
188 m_localId = (uint)info.GetValue("m_localId", typeof(uint)); 188 m_localId = (uint)info.GetValue("m_localId", typeof(uint));
189 189
190 //System.Console.WriteLine("EntityBase Deserialize END"); 190 //m_log.Debug("EntityBase Deserialize END");
191 } 191 }
192 192
193 [SecurityPermission(SecurityAction.LinkDemand, 193 [SecurityPermission(SecurityAction.LinkDemand,
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 0faeef1..67cc1a1 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
126 { 126 {
127 isHomeUser = HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile); 127 isHomeUser = HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile);
128 realHandle = m_hg.FindRegionHandle(regionHandle); 128 realHandle = m_hg.FindRegionHandle(regionHandle);
129 Console.WriteLine("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString()); 129 m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString());
130 } 130 }
131 /// 131 ///
132 /// Hypergrid mod stop 132 /// Hypergrid mod stop
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 039b81b..db322b4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes
358 { 358 {
359 if (ownerID == CommsManager.UserProfileCacheService.LibraryRoot.Owner) 359 if (ownerID == CommsManager.UserProfileCacheService.LibraryRoot.Owner)
360 { 360 {
361 //Console.WriteLine("request info for library item"); 361 //m_log.Debug("request info for library item");
362 return; 362 return;
363 } 363 }
364 364
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 659aaa6..2a3f068 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1538,7 +1538,7 @@ namespace OpenSim.Region.Framework.Scenes
1538 /// </returns> 1538 /// </returns>
1539 public bool CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp, bool silent) 1539 public bool CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp, bool silent)
1540 { 1540 {
1541 //Console.WriteLine(" >>> CrossPrimGroupIntoNewRegion <<<"); 1541 //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<");
1542 1542
1543 bool successYN = false; 1543 bool successYN = false;
1544 grp.RootPart.UpdateFlag = 0; 1544 grp.RootPart.UpdateFlag = 0;
@@ -1695,7 +1695,7 @@ namespace OpenSim.Region.Framework.Scenes
1695 1695
1696 public bool IncomingCreateObject(ISceneObject sog) 1696 public bool IncomingCreateObject(ISceneObject sog)
1697 { 1697 {
1698 //Console.WriteLine(" >>> IncomingCreateObject <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); 1698 //m_log.Debug(" >>> IncomingCreateObject <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
1699 SceneObjectGroup newObject; 1699 SceneObjectGroup newObject;
1700 try 1700 try
1701 { 1701 {
@@ -2482,7 +2482,7 @@ namespace OpenSim.Region.Framework.Scenes
2482 2482
2483 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 2483 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
2484 { 2484 {
2485 //Console.WriteLine(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 2485 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
2486 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 2486 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
2487 if (childAgentUpdate != null) 2487 if (childAgentUpdate != null)
2488 { 2488 {
@@ -2924,7 +2924,7 @@ namespace OpenSim.Region.Framework.Scenes
2924 /// <param name="cmdparams"></param> 2924 /// <param name="cmdparams"></param>
2925 public void HandleEditCommand(string[] cmdparams) 2925 public void HandleEditCommand(string[] cmdparams)
2926 { 2926 {
2927 Console.WriteLine("Searching for Primitive: '" + cmdparams[2] + "'"); 2927 m_log.Debug("Searching for Primitive: '" + cmdparams[2] + "'");
2928 2928
2929 List<EntityBase> EntityList = GetEntities(); 2929 List<EntityBase> EntityList = GetEntities();
2930 2930
@@ -2941,7 +2941,7 @@ namespace OpenSim.Region.Framework.Scenes
2941 new Vector3(Convert.ToSingle(cmdparams[3]), Convert.ToSingle(cmdparams[4]), 2941 new Vector3(Convert.ToSingle(cmdparams[3]), Convert.ToSingle(cmdparams[4]),
2942 Convert.ToSingle(cmdparams[5]))); 2942 Convert.ToSingle(cmdparams[5])));
2943 2943
2944 Console.WriteLine("Edited scale of Primitive: " + part.Name); 2944 m_log.Debug("Edited scale of Primitive: " + part.Name);
2945 } 2945 }
2946 } 2946 }
2947 } 2947 }
@@ -3414,7 +3414,7 @@ namespace OpenSim.Region.Framework.Scenes
3414 3414
3415 public void TerrainUnAcked(IClientAPI client, int patchX, int patchY) 3415 public void TerrainUnAcked(IClientAPI client, int patchX, int patchY)
3416 { 3416 {
3417 //Console.WriteLine("Terrain packet unacked, resending patch: " + patchX + " , " + patchY); 3417 //m_log.Debug("Terrain packet unacked, resending patch: " + patchX + " , " + patchY);
3418 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised()); 3418 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised());
3419 } 3419 }
3420 3420
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9a6bd87..c3b60f8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Framework.Scenes
372 Dictionary<ulong, string> seeds 372 Dictionary<ulong, string> seeds
373 = new Dictionary<ulong, string>(avatar.Scene.CapsModule.GetChildrenSeeds(avatar.UUID)); 373 = new Dictionary<ulong, string>(avatar.Scene.CapsModule.GetChildrenSeeds(avatar.UUID));
374 374
375 //Console.WriteLine(" !!! No. of seeds: " + seeds.Count); 375 //m_log.Debug(" !!! No. of seeds: " + seeds.Count);
376 if (!seeds.ContainsKey(avatar.Scene.RegionInfo.RegionHandle)) 376 if (!seeds.ContainsKey(avatar.Scene.RegionInfo.RegionHandle))
377 seeds.Add(avatar.Scene.RegionInfo.RegionHandle, avatar.ControllingClient.RequestClientInfo().CapsPath); 377 seeds.Add(avatar.Scene.RegionInfo.RegionHandle, avatar.ControllingClient.RequestClientInfo().CapsPath);
378 378
@@ -954,7 +954,7 @@ namespace OpenSim.Region.Framework.Scenes
954 int count = 20; 954 int count = 20;
955 while (m_agentsInTransit.Contains(id) && count-- > 0) 955 while (m_agentsInTransit.Contains(id) && count-- > 0)
956 { 956 {
957 //Console.WriteLine(" >>> Waiting... " + count); 957 //m_log.Debug(" >>> Waiting... " + count);
958 Thread.Sleep(1000); 958 Thread.Sleep(1000);
959 } 959 }
960 960
@@ -966,7 +966,7 @@ namespace OpenSim.Region.Framework.Scenes
966 966
967 public bool ReleaseAgent(UUID id) 967 public bool ReleaseAgent(UUID id)
968 { 968 {
969 //Console.WriteLine(" >>> ReleaseAgent called <<< "); 969 //m_log.Debug(" >>> ReleaseAgent called <<< ");
970 return ResetFromTransit(id); 970 return ResetFromTransit(id);
971 } 971 }
972 972
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.Framework.Scenes
1104 //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); 1104 //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
1105 agent.ControllingClient.RequestClientInfo(); 1105 agent.ControllingClient.RequestClientInfo();
1106 1106
1107 //Console.WriteLine("BEFORE CROSS"); 1107 //m_log.Debug("BEFORE CROSS");
1108 //Scene.DumpChildrenSeeds(UUID); 1108 //Scene.DumpChildrenSeeds(UUID);
1109 //DumpKnownRegions(); 1109 //DumpKnownRegions();
1110 string agentcaps; 1110 string agentcaps;
@@ -1162,7 +1162,7 @@ namespace OpenSim.Region.Framework.Scenes
1162 } 1162 }
1163 } 1163 }
1164 1164
1165 //Console.WriteLine("AFTER CROSS"); 1165 //m_log.Debug("AFTER CROSS");
1166 //Scene.DumpChildrenSeeds(UUID); 1166 //Scene.DumpChildrenSeeds(UUID);
1167 //DumpKnownRegions(); 1167 //DumpKnownRegions();
1168 return agent; 1168 return agent;
@@ -1252,14 +1252,14 @@ namespace OpenSim.Region.Framework.Scenes
1252 1252
1253// private void Dump(string msg, List<ulong> handles) 1253// private void Dump(string msg, List<ulong> handles)
1254// { 1254// {
1255// Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg); 1255// m_log.Info"-------------- HANDLE DUMP ({0}) ---------", msg);
1256// foreach (ulong handle in handles) 1256// foreach (ulong handle in handles)
1257// { 1257// {
1258// uint x, y; 1258// uint x, y;
1259// Utils.LongToUInts(handle, out x, out y); 1259// Utils.LongToUInts(handle, out x, out y);
1260// x = x / Constants.RegionSize; 1260// x = x / Constants.RegionSize;
1261// y = y / Constants.RegionSize; 1261// y = y / Constants.RegionSize;
1262// Console.WriteLine("({0}, {1})", x, y); 1262// m_log.Info("({0}, {1})", x, y);
1263// } 1263// }
1264// } 1264// }
1265 } 1265 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 00b49a1..07c77aa 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Framework.Scenes
322 322
323 public bool TrySetCurrentScene(UUID regionID) 323 public bool TrySetCurrentScene(UUID regionID)
324 { 324 {
325 Console.WriteLine("Searching for Region: '{0}'", regionID.ToString()); 325 m_log.Debug("Searching for Region: '" + regionID + "'");
326 326
327 foreach (Scene scene in m_localScenes) 327 foreach (Scene scene in m_localScenes)
328 { 328 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 7d36a63..5c47710 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Framework.Scenes
309 309
310 public string GetStateSnapshot() 310 public string GetStateSnapshot()
311 { 311 {
312 //Console.WriteLine(" >>> GetStateSnapshot <<<"); 312 //m_log.Debug(" >>> GetStateSnapshot <<<");
313 313
314 List<string> assemblies = new List<string>(); 314 List<string> assemblies = new List<string>();
315 Dictionary<UUID, string> states = new Dictionary<UUID, string>(); 315 Dictionary<UUID, string> states = new Dictionary<UUID, string>();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 69bc554..d1aef1c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -526,7 +526,7 @@ namespace OpenSim.Region.Framework.Scenes
526 } 526 }
527 else 527 else
528 { 528 {
529 Console.WriteLine("found unexpected element: " + reader.Name); 529 m_log.Warn("found unexpected element: " + reader.Name);
530 reader.Read(); 530 reader.Read();
531 } 531 }
532 break; 532 break;
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();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c625a72..9666525 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -666,7 +666,7 @@ namespace OpenSim.Region.Framework.Scenes
666 666
667 fileData = Utils.StringToBytes(invString.BuildString); 667 fileData = Utils.StringToBytes(invString.BuildString);
668 668
669 //Console.WriteLine(Utils.BytesToString(fileData)); 669 //m_log.Debug(Utils.BytesToString(fileData));
670 //m_log.Debug("[PRIM INVENTORY]: RequestInventoryFile fileData: " + Utils.BytesToString(fileData)); 670 //m_log.Debug("[PRIM INVENTORY]: RequestInventoryFile fileData: " + Utils.BytesToString(fileData));
671 671
672 if (fileData.Length > 2) 672 if (fileData.Length > 2)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 429b615..dd8c719 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Framework.Scenes
71 { 71 {
72// ~ScenePresence() 72// ~ScenePresence()
73// { 73// {
74// System.Console.WriteLine("[ScenePresence] Destructor called"); 74// m_log.Debug("[ScenePresence] Destructor called");
75// } 75// }
76 76
77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -409,7 +409,7 @@ namespace OpenSim.Region.Framework.Scenes
409 } 409 }
410 catch (Exception e) 410 catch (Exception e)
411 { 411 {
412 Console.WriteLine("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message); 412 m_log.Error("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message);
413 } 413 }
414 } 414 }
415 415
@@ -449,7 +449,7 @@ namespace OpenSim.Region.Framework.Scenes
449 } 449 }
450 catch (Exception e) 450 catch (Exception e)
451 { 451 {
452 Console.WriteLine("[SCENEPRESENCE]: VELOCITY " + e.Message); 452 m_log.Error("[SCENEPRESENCE]: VELOCITY " + e.Message);
453 } 453 }
454 } 454 }
455 455
@@ -525,20 +525,20 @@ namespace OpenSim.Region.Framework.Scenes
525 DropOldNeighbours(old); 525 DropOldNeighbours(old);
526 Scene.CapsModule.SetChildrenSeed(UUID, seeds); 526 Scene.CapsModule.SetChildrenSeed(UUID, seeds);
527 KnownRegions = seeds; 527 KnownRegions = seeds;
528 //Console.WriteLine(" ++++++++++AFTER+++++++++++++ "); 528 //m_log.Debug(" ++++++++++AFTER+++++++++++++ ");
529 //DumpKnownRegions(); 529 //DumpKnownRegions();
530 } 530 }
531 531
532 public void DumpKnownRegions() 532 public void DumpKnownRegions()
533 { 533 {
534 Console.WriteLine("================ KnownRegions {0} ================", Scene.RegionInfo.RegionName); 534 m_log.Info("================ KnownRegions "+Scene.RegionInfo.RegionName+" ================");
535 foreach (KeyValuePair<ulong, string> kvp in KnownRegions) 535 foreach (KeyValuePair<ulong, string> kvp in KnownRegions)
536 { 536 {
537 uint x, y; 537 uint x, y;
538 Utils.LongToUInts(kvp.Key, out x, out y); 538 Utils.LongToUInts(kvp.Key, out x, out y);
539 x = x / Constants.RegionSize; 539 x = x / Constants.RegionSize;
540 y = y / Constants.RegionSize; 540 y = y / Constants.RegionSize;
541 Console.WriteLine(" >> {0}, {1}: {2}", x, y, kvp.Value); 541 m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
542 } 542 }
543 } 543 }
544 544
@@ -991,7 +991,7 @@ namespace OpenSim.Region.Framework.Scenes
991 if (m_knownChildRegions.ContainsKey(regionHandle)) 991 if (m_knownChildRegions.ContainsKey(regionHandle))
992 { 992 {
993 m_knownChildRegions.Remove(regionHandle); 993 m_knownChildRegions.Remove(regionHandle);
994 //Console.WriteLine(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count); 994 //m_log.Debug(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count);
995 } 995 }
996 } 996 }
997 } 997 }
@@ -1066,7 +1066,7 @@ namespace OpenSim.Region.Framework.Scenes
1066 { 1066 {
1067 //if (m_isChildAgent) 1067 //if (m_isChildAgent)
1068 //{ 1068 //{
1069 // // Console.WriteLine("DEBUG: HandleAgentUpdate: child agent"); 1069 // // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
1070 // return; 1070 // return;
1071 //} 1071 //}
1072 1072
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Framework.Scenes
1406 catch (Exception ex) 1406 catch (Exception ex)
1407 { 1407 {
1408 //Why did I get this error? 1408 //Why did I get this error?
1409 Console.WriteLine("[SCENEPRESENCE]: DoMoveToPosition" + ex.ToString()); 1409 m_log.Error("[SCENEPRESENCE]: DoMoveToPosition" + ex.ToString());
1410 } 1410 }
1411 } 1411 }
1412 1412
@@ -1923,7 +1923,7 @@ namespace OpenSim.Region.Framework.Scenes
1923 { 1923 {
1924 if (m_isChildAgent) 1924 if (m_isChildAgent)
1925 { 1925 {
1926 Console.WriteLine("DEBUG: AddNewMovement: child agent"); 1926 m_log.Debug("DEBUG: AddNewMovement: child agent");
1927 return; 1927 return;
1928 } 1928 }
1929 1929
@@ -2507,8 +2507,8 @@ namespace OpenSim.Region.Framework.Scenes
2507 x = x / Constants.RegionSize; 2507 x = x / Constants.RegionSize;
2508 y = y / Constants.RegionSize; 2508 y = y / Constants.RegionSize;
2509 2509
2510 //Console.WriteLine("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX))); 2510 //m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX)));
2511 //Console.WriteLine("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY))); 2511 //m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY)));
2512 if (Util.IsOutsideView(x, newRegionX, y, newRegionY)) 2512 if (Util.IsOutsideView(x, newRegionX, y, newRegionY))
2513 { 2513 {
2514 byebyeRegions.Add(handle); 2514 byebyeRegions.Add(handle);
@@ -2561,7 +2561,7 @@ namespace OpenSim.Region.Framework.Scenes
2561 2561
2562 public void ChildAgentDataUpdate(AgentData cAgentData) 2562 public void ChildAgentDataUpdate(AgentData cAgentData)
2563 { 2563 {
2564 //Console.WriteLine(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); 2564 //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
2565 if (!IsChildAgent) 2565 if (!IsChildAgent)
2566 return; 2566 return;
2567 2567
@@ -2577,7 +2577,7 @@ namespace OpenSim.Region.Framework.Scenes
2577 if (!IsChildAgent) 2577 if (!IsChildAgent)
2578 return; 2578 return;
2579 2579
2580 //Console.WriteLine(" >>> ChildAgentPositionUpdate <<< " + rRegionX + "-" + rRegionY); 2580 //m_log.Debug(" >>> ChildAgentPositionUpdate <<< " + rRegionX + "-" + rRegionY);
2581 int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize; 2581 int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
2582 int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize; 2582 int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
2583 2583
@@ -2816,7 +2816,7 @@ namespace OpenSim.Region.Framework.Scenes
2816 2816
2817 protected ScenePartUpdate(SerializationInfo info, StreamingContext context) 2817 protected ScenePartUpdate(SerializationInfo info, StreamingContext context)
2818 { 2818 {
2819 //System.Console.WriteLine("ScenePartUpdate Deserialize BGN"); 2819 //m_log.Debug("ScenePartUpdate Deserialize BGN");
2820 2820
2821 if (info == null) 2821 if (info == null)
2822 { 2822 {
@@ -2827,7 +2827,7 @@ namespace OpenSim.Region.Framework.Scenes
2827 LastFullUpdateTime = (uint)info.GetValue("LastFullUpdateTime", typeof(uint)); 2827 LastFullUpdateTime = (uint)info.GetValue("LastFullUpdateTime", typeof(uint));
2828 LastTerseUpdateTime = (uint)info.GetValue("LastTerseUpdateTime", typeof(uint)); 2828 LastTerseUpdateTime = (uint)info.GetValue("LastTerseUpdateTime", typeof(uint));
2829 2829
2830 //System.Console.WriteLine("ScenePartUpdate Deserialize END"); 2830 //m_log.Debug("ScenePartUpdate Deserialize END");
2831 } 2831 }
2832 2832
2833 [SecurityPermission(SecurityAction.LinkDemand, 2833 [SecurityPermission(SecurityAction.LinkDemand,
@@ -3084,7 +3084,7 @@ namespace OpenSim.Region.Framework.Scenes
3084 protected ScenePresence(SerializationInfo info, StreamingContext context) 3084 protected ScenePresence(SerializationInfo info, StreamingContext context)
3085 : base (info, context) 3085 : base (info, context)
3086 { 3086 {
3087 //System.Console.WriteLine("ScenePresence Deserialize BGN"); 3087 //m_log.Debug("ScenePresence Deserialize BGN");
3088 3088
3089 if (info == null) 3089 if (info == null)
3090 { 3090 {
@@ -3239,7 +3239,7 @@ namespace OpenSim.Region.Framework.Scenes
3239 3239
3240 m_state = (byte)info.GetValue("m_state", typeof(byte)); 3240 m_state = (byte)info.GetValue("m_state", typeof(byte));
3241 3241
3242 //System.Console.WriteLine("ScenePresence Deserialize END"); 3242 //m_log.Debug("ScenePresence Deserialize END");
3243 } 3243 }
3244 3244
3245 [SecurityPermission(SecurityAction.LinkDemand, 3245 [SecurityPermission(SecurityAction.LinkDemand,
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
index fd7ff96..93bbf32 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
@@ -27,11 +27,15 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using log4net;
31using System.Reflection;
30 32
31namespace OpenSim.Region.Framework.Scenes.Scripting 33namespace OpenSim.Region.Framework.Scenes.Scripting
32{ 34{
33 public class NullScriptHost : IScriptHost 35 public class NullScriptHost : IScriptHost
34 { 36 {
37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38
35 private Vector3 m_pos = new Vector3(128, 128, 30); 39 private Vector3 m_pos = new Vector3(128, 128, 30);
36 40
37 public string Name 41 public string Name
@@ -80,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
80 84
81 public void SetText(string text, Vector3 color, double alpha) 85 public void SetText(string text, Vector3 color, double alpha)
82 { 86 {
83 Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); 87 m_log.Warn("Tried to SetText "+text+" on NullScriptHost");
84 } 88 }
85 } 89 }
86} 90}
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
index 58228cc..79ffe44 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
@@ -87,10 +87,10 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
87 //} 87 //}
88 88
89 89
90 //Console.WriteLine("Loading: " + FileName); 90 //m_log.Debug("Loading: " + FileName);
91 //foreach (Type _t in a.GetTypes()) 91 //foreach (Type _t in a.GetTypes())
92 //{ 92 //{
93 // Console.WriteLine("Type: " + _t.ToString()); 93 // m_log.Debug("Type: " + _t.ToString());
94 //} 94 //}
95 95
96 Type t; 96 Type t;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index b2cea5d..039e9a7 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
144 SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); 144 SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
145 145
146 // Know what's not thread safe in Mono... modifying timers. 146 // Know what's not thread safe in Mono... modifying timers.
147 // System.Console.WriteLine("Firing Stats Heart Beat"); 147 // m_log.Debug("Firing Stats Heart Beat");
148 lock (m_report) 148 lock (m_report)
149 { 149 {
150 uint regionFlags = 0; 150 uint regionFlags = 0;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 096b2cb..c984c7d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
55 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 55 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
56 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 56 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
57 57
58 //System.Console.WriteLine("retrievedPart : {0}", retrievedPart); 58 //m_log.Debug("retrievedPart : {0}", retrievedPart);
59 // If the parts have the same UUID then we will consider them as one and the same 59 // If the parts have the same UUID then we will consider them as one and the same
60 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); 60 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
61 } 61 }
@@ -136,4 +136,4 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
136 Assert.That(retrievedPart, Is.Null); 136 Assert.That(retrievedPart, Is.Null);
137 } 137 }
138 } 138 }
139} \ No newline at end of file 139}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 3e0f48f..b5dbb38 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -36,6 +36,8 @@ using OpenSim.Region.Communications.Local;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39using log4net;
40using System.Reflection;
39 41
40namespace OpenSim.Region.CoreModules.Scenes.Tests 42namespace OpenSim.Region.CoreModules.Scenes.Tests
41{ 43{
@@ -45,6 +47,8 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
45 [TestFixture] 47 [TestFixture]
46 public class SceneObjectLinkingTests 48 public class SceneObjectLinkingTests
47 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51
48 [Test] 52 [Test]
49 public void TestLinkDelink2SceneObjects() 53 public void TestLinkDelink2SceneObjects()
50 { 54 {
@@ -80,10 +84,10 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
80 84
81 if (debugtest) 85 if (debugtest)
82 { 86 {
83 System.Console.WriteLine("parts: {0}", grp1.Children.Count); 87 m_log.Debug("parts: " + grp1.Children.Count);
84 System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation); 88 m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
85 System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset); 89 m_log.Debug("Group1: Prim1: OffsetPosition:"+ part1.OffsetPosition+", OffsetRotation:"+part1.RotationOffset);
86 System.Console.WriteLine("Group1: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.OffsetPosition, part2.RotationOffset); 90 m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+part2.RotationOffset);
87 } 91 }
88 92
89 // root part should have no offset position or rotation 93 // root part should have no offset position or rotation
@@ -101,13 +105,13 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
101 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 105 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
102 106
103 if (debugtest) 107 if (debugtest)
104 System.Console.WriteLine(rotEuler1); 108 m_log.Debug(rotEuler1);
105 109
106 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw); 110 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
107 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 111 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
108 112
109 if (debugtest) 113 if (debugtest)
110 System.Console.WriteLine(rotEuler2); 114 m_log.Debug(rotEuler2);
111 115
112 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f)); 116 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
113 117
@@ -115,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
115 grp1.DelinkFromGroup(part2.LocalId); 119 grp1.DelinkFromGroup(part2.LocalId);
116 120
117 if (debugtest) 121 if (debugtest)
118 System.Console.WriteLine("Group2: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset); 122 m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset);
119 123
120 Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink."); 124 Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
121 Assert.That(part2.AbsolutePosition == Vector3.Zero); 125 Assert.That(part2.AbsolutePosition == Vector3.Zero);
@@ -175,16 +179,16 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
175 179
176 if (debugtest) 180 if (debugtest)
177 { 181 {
178 System.Console.WriteLine("--------After Link-------"); 182 m_log.Debug("--------After Link-------");
179 System.Console.WriteLine("Group1: parts: {0}", grp1.Children.Count); 183 m_log.Debug("Group1: parts:" + grp1.Children.Count);
180 System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation); 184 m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
181 System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset); 185 m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
182 System.Console.WriteLine("Group1: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.OffsetPosition, part2.RotationOffset); 186 m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+ part2.RotationOffset);
183 187
184 System.Console.WriteLine("Group3: parts: {0}", grp3.Children.Count); 188 m_log.Debug("Group3: parts:"+grp3.Children.Count);
185 System.Console.WriteLine("Group3: Pos:{0}, Rot:{1}", grp3.AbsolutePosition, grp3.Rotation); 189 m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
186 System.Console.WriteLine("Group3: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part3.OffsetPosition, part3.RotationOffset); 190 m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
187 System.Console.WriteLine("Group3: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part4.OffsetPosition, part4.RotationOffset); 191 m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
188 } 192 }
189 193
190 // Required for linking 194 // Required for linking
@@ -206,13 +210,13 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
206 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 210 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
207 211
208 if (debugtest) 212 if (debugtest)
209 System.Console.WriteLine(rotEuler1); 213 m_log.Debug(rotEuler1);
210 214
211 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw); 215 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
212 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 216 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
213 217
214 if (debugtest) 218 if (debugtest)
215 System.Console.WriteLine(rotEuler2); 219 m_log.Debug(rotEuler2);
216 220
217 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f)); 221 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
218 222
@@ -225,16 +229,16 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
225 229
226 if (debugtest) 230 if (debugtest)
227 { 231 {
228 System.Console.WriteLine("--------After De-Link-------"); 232 m_log.Debug("--------After De-Link-------");
229 System.Console.WriteLine("Group1: parts: {0}", grp1.Children.Count); 233 m_log.Debug("Group1: parts:" + grp1.Children.Count);
230 System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation); 234 m_log.Debug("Group1: Pos:" + grp1.AbsolutePosition + ", Rot:" + grp1.Rotation);
231 System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset); 235 m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
232 System.Console.WriteLine("NoGroup: Prim2: AbsolutePosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset); 236 m_log.Debug("Group1: Prim2: OffsetPosition:" + part2.OffsetPosition + ", OffsetRotation:" + part2.RotationOffset);
233 237
234 System.Console.WriteLine("Group3: parts: {0}", grp3.Children.Count); 238 m_log.Debug("Group3: parts:" + grp3.Children.Count);
235 System.Console.WriteLine("Group3: Pos:{0}, Rot:{1}", grp3.AbsolutePosition, grp3.Rotation); 239 m_log.Debug("Group3: Pos:" + grp3.AbsolutePosition + ", Rot:" + grp3.Rotation);
236 System.Console.WriteLine("Group3: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part3.OffsetPosition, part3.RotationOffset); 240 m_log.Debug("Group3: Prim1: OffsetPosition:" + part3.OffsetPosition + ", OffsetRotation:" + part3.RotationOffset);
237 System.Console.WriteLine("Group3: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part4.OffsetPosition, part4.RotationOffset); 241 m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset);
238 } 242 }
239 243
240 Assert.That(part2.AbsolutePosition == Vector3.Zero); 244 Assert.That(part2.AbsolutePosition == Vector3.Zero);
diff --git a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
index 9fbbb15..f23fc06 100644
--- a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
53 m_leftY = leftY; 53 m_leftY = leftY;
54 m_width = width; 54 m_width = width;
55 m_height = height; 55 m_height = height;
56 // Console.WriteLine("creating quadtree node " + m_quadID); 56 // m_log.Debug("creating quadtree node " + m_quadID);
57 } 57 }
58 58
59 public void AddObject(SceneObjectGroup obj) 59 public void AddObject(SceneObjectGroup obj)
diff --git a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 452ada9..2b7611f 100644
--- a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
92 92
93 protected UpdateQueue(SerializationInfo info, StreamingContext context) 93 protected UpdateQueue(SerializationInfo info, StreamingContext context)
94 { 94 {
95 //System.Console.WriteLine("UpdateQueue Deserialize BGN"); 95 //m_log.Debug("UpdateQueue Deserialize BGN");
96 96
97 if (info == null) 97 if (info == null)
98 { 98 {
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
107 m_ids.Add(new UUID(guid)); 107 m_ids.Add(new UUID(guid));
108 } 108 }
109 109
110 //System.Console.WriteLine("UpdateQueue Deserialize END"); 110 //m_log.Debug("UpdateQueue Deserialize END");
111 } 111 }
112 112
113 [SecurityPermission(SecurityAction.LinkDemand, 113 [SecurityPermission(SecurityAction.LinkDemand,