aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
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/Communications/Local
parentAllow delivery of object messages gridwide (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs10
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs5
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 306ea27..33bc2fa 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -84,10 +84,10 @@ namespace OpenSim.Region.Communications.Local
84 /// <returns></returns> 84 /// <returns></returns>
85 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 85 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
86 { 86 {
87 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); 87 //m_log.Debug("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
88 if (!m_regions.ContainsKey(regionInfo.RegionHandle)) 88 if (!m_regions.ContainsKey(regionInfo.RegionHandle))
89 { 89 {
90 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle); 90 //m_log.Debug("CommsManager - Adding Region " + regionInfo.RegionHandle);
91 m_regions.Add(regionInfo.RegionHandle, regionInfo); 91 m_regions.Add(regionInfo.RegionHandle, regionInfo);
92 92
93 RegionCommsListener regionHost = new RegionCommsListener(); 93 RegionCommsListener regionHost = new RegionCommsListener();
@@ -145,15 +145,15 @@ namespace OpenSim.Region.Communications.Local
145 /// <returns></returns> 145 /// <returns></returns>
146 public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y) 146 public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
147 { 147 {
148 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle); 148 // m_log.Debug("Finding Neighbours to " + regionInfo.RegionHandle);
149 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>(); 149 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
150 150
151 foreach (RegionInfo reg in m_regions.Values) 151 foreach (RegionInfo reg in m_regions.Values)
152 { 152 {
153 // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY); 153 // m_log.Debug("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
154 if (reg.RegionLocX != x || reg.RegionLocY != y) 154 if (reg.RegionLocX != x || reg.RegionLocY != y)
155 { 155 {
156 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location"); 156 //m_log.Debug("CommsManager- RequestNeighbours() - found a different region in list, checking location");
157 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2))) 157 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
158 { 158 {
159 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2))) 159 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index f4fe686..a239033 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -29,11 +29,14 @@ using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
34{ 36{
35 public class LocalUserServices : UserManagerBase 37 public class LocalUserServices : UserManagerBase
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 private readonly uint m_defaultHomeX; 40 private readonly uint m_defaultHomeX;
38 private readonly uint m_defaultHomeY; 41 private readonly uint m_defaultHomeY;
39 42
@@ -64,7 +67,7 @@ namespace OpenSim.Region.Communications.Local
64 return profile; 67 return profile;
65 } 68 }
66 69
67 Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); 70 m_log.Debug("Unknown Master User. Sandbox Mode: Creating Account");
68 AddUser(firstName, lastName, password, "", m_defaultHomeX, m_defaultHomeY); 71 AddUser(firstName, lastName, password, "", m_defaultHomeX, m_defaultHomeY);
69 return GetUserProfile(firstName, lastName); 72 return GetUserProfile(firstName, lastName);
70 } 73 }