diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index b39e0b7..217bb81 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |||
@@ -141,6 +141,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
141 | 141 | ||
142 | public class OGS1InterRegionRemoting : MarshalByRefObject | 142 | public class OGS1InterRegionRemoting : MarshalByRefObject |
143 | { | 143 | { |
144 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
145 | |||
144 | public OGS1InterRegionRemoting() | 146 | public OGS1InterRegionRemoting() |
145 | { | 147 | { |
146 | } | 148 | } |
@@ -230,18 +232,18 @@ namespace OpenSim.Region.Communications.OGS1 | |||
230 | return false; | 232 | return false; |
231 | } | 233 | } |
232 | } | 234 | } |
235 | |||
233 | public bool TellRegionToCloseChildConnection(ulong regionHandle, Guid agentID) | 236 | public bool TellRegionToCloseChildConnection(ulong regionHandle, Guid agentID) |
234 | { | 237 | { |
235 | try | 238 | try |
236 | { | 239 | { |
237 | return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); | 240 | return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); |
238 | |||
239 | } | 241 | } |
240 | catch (RemotingException) | 242 | catch (RemotingException) |
241 | { | 243 | { |
242 | OpenSim.Framework.Console.MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to remote region: " + regionHandle.ToString()); | 244 | m_log.Info("[INTERREGION]: Remoting Error: Unable to connect to remote region: " + regionHandle.ToString()); |
243 | return false; | 245 | return false; |
244 | } | 246 | } |
245 | } | 247 | } |
246 | } | 248 | } |
247 | } \ No newline at end of file | 249 | } |