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/SceneCommunicationService.cs | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-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/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 14 |
1 files changed, 7 insertions, 7 deletions
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 | } |