aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs15
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
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
245 int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections"); 245 int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");
246 m_internalEndPoint = new IPEndPoint(internalAddress, internalPort); 246 m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);
247 247
248 m_externalHostName = MainLog.Instance.CmdPrompt("External Host Name", "localhost"); 248 m_externalHostName = GetString(configData, "ExternalHostName", "localhost", "External Host Name");
249
250 249
251 250
252 251
@@ -389,6 +388,18 @@ namespace OpenSim.Framework.Types
389 388
390 } 389 }
391 390
391 private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
392 {
393 string s = configData.GetAttribute(attrName);
394
395 if (String.IsNullOrEmpty( s ))
396 {
397 s = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
398 configData.SetAttribute(attrName, s );
399 }
400 return s;
401 }
402
392 private IPAddress GetIPAddress(IGenericConfig configData, string attrName, string defaultvalue, string prompt) 403 private IPAddress GetIPAddress(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
393 { 404 {
394 string addressStr = configData.GetAttribute(attrName); 405 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
230 m_udpServer.Add(udpServer); 230 m_udpServer.Add(udpServer);
231 this.regionData.Add(regionDat); 231 this.regionData.Add(regionDat);
232 232
233 /*
234 m_log.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
235 m_log.Verbose( "Initialising world");
236 m_log.componentname = "Region " + regionData.RegionName;
237 */
238
239 LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache, httpServer); 233 LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache, httpServer);
240 this.m_localWorld.Add(LocalWorld); 234 this.m_localWorld.Add(LocalWorld);
241 //LocalWorld.InventoryCache = InventoryCache; 235 //LocalWorld.InventoryCache = InventoryCache;