diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 36 |
1 files changed, 18 insertions, 18 deletions
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, |