diff options
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 20 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index ad98816..afc4060 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -29,14 +29,15 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Net.Sockets; | 31 | using System.Net.Sockets; |
32 | using System.Reflection; | ||
32 | using System.Xml; | 33 | using System.Xml; |
33 | using System.IO; | 34 | using System.IO; |
35 | using log4net; | ||
34 | using Nini.Config; | 36 | using Nini.Config; |
35 | using OpenMetaverse; | 37 | using OpenMetaverse; |
36 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
37 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
38 | 40 | ||
39 | |||
40 | namespace OpenSim.Framework | 41 | namespace OpenSim.Framework |
41 | { | 42 | { |
42 | public class RegionLightShareData : ICloneable | 43 | public class RegionLightShareData : ICloneable |
@@ -96,10 +97,9 @@ namespace OpenSim.Framework | |||
96 | 97 | ||
97 | [Serializable] | 98 | [Serializable] |
98 | public class SimpleRegionInfo | 99 | public class SimpleRegionInfo |
99 | { | 100 | { |
100 | // private static readonly log4net.ILog m_log | 101 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
101 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 102 | |
102 | |||
103 | /// <summary> | 103 | /// <summary> |
104 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) | 104 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) |
105 | /// </summary> | 105 | /// </summary> |
@@ -327,8 +327,7 @@ namespace OpenSim.Framework | |||
327 | 327 | ||
328 | public class RegionInfo | 328 | public class RegionInfo |
329 | { | 329 | { |
330 | // private static readonly log4net.ILog m_log | 330 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
331 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
332 | 331 | ||
333 | public bool commFailTF = false; | 332 | public bool commFailTF = false; |
334 | public ConfigurationMember configMember; | 333 | public ConfigurationMember configMember; |
@@ -772,9 +771,16 @@ namespace OpenSim.Framework | |||
772 | } | 771 | } |
773 | 772 | ||
774 | if (externalName == "SYSTEMIP") | 773 | if (externalName == "SYSTEMIP") |
774 | { | ||
775 | m_externalHostName = Util.GetLocalHost().ToString(); | 775 | m_externalHostName = Util.GetLocalHost().ToString(); |
776 | m_log.InfoFormat( | ||
777 | "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}", | ||
778 | m_externalHostName, name); | ||
779 | } | ||
776 | else | 780 | else |
781 | { | ||
777 | m_externalHostName = externalName; | 782 | m_externalHostName = externalName; |
783 | } | ||
778 | 784 | ||
779 | m_regionType = config.GetString("RegionType", String.Empty); | 785 | m_regionType = config.GetString("RegionType", String.Empty); |
780 | 786 | ||
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index a09b903..501d47f 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -192,9 +192,7 @@ namespace OpenSim | |||
192 | // Hook up to the watchdog timer | 192 | // Hook up to the watchdog timer |
193 | Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler; | 193 | Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler; |
194 | 194 | ||
195 | PrintFileToConsole("startuplogo.txt"); | 195 | PrintFileToConsole("startuplogo.txt"); |
196 | |||
197 | m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString()); | ||
198 | 196 | ||
199 | // For now, start at the 'root' level by default | 197 | // For now, start at the 'root' level by default |
200 | if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it | 198 | if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it |