* now saves ExternalHostName in config

2 files changed, 13 insertions, 8 deletions

diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index d98dd60..cbd8695 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -245,8 +245,7 @@ namespace OpenSim.Framework.Types
                 int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");

                 m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);

 

-                m_externalHostName = MainLog.Instance.CmdPrompt("External Host Name", "localhost");

-

+                m_externalHostName = GetString(configData, "ExternalHostName", "localhost", "External Host Name");

                 

 

                 

@@ -389,6 +388,18 @@ namespace OpenSim.Framework.Types
 

         }

 

+        private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt)

+        {

+            string s = configData.GetAttribute(attrName);

+

+            if (String.IsNullOrEmpty( s ))

+            {

+                s = MainLog.Instance.CmdPrompt(prompt, defaultvalue);

+                configData.SetAttribute(attrName, s );

+            }

+            return s;

+        }

+

         private IPAddress GetIPAddress(IGenericConfig configData, string attrName, string defaultvalue, string prompt)

         {

             string addressStr = configData.GetAttribute(attrName);

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 32faed8..102ff76 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -230,12 +230,6 @@ namespace OpenSim
                 m_udpServer.Add(udpServer);

                 this.regionData.Add(regionDat);

 

-                /*

-                m_log.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());

-                m_log.Verbose( "Initialising world");

-                m_log.componentname = "Region " + regionData.RegionName;

-                */

-

                 LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache, httpServer);

                 this.m_localWorld.Add(LocalWorld);

                 //LocalWorld.InventoryCache = InventoryCache;