From c62a6adb2b234fcbe99e352f4bd2af0cbf683a99 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Feb 2010 19:56:30 -0800
Subject: change "SYSTEMIP" to "localhost" in the create region console command
 prompt

---
 OpenSim/Framework/RegionInfo.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 88b62e0..ee5dd37 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -474,15 +474,15 @@ namespace OpenSim.Framework
 
             if (config.Contains("ExternalHostName"))
             {
-                externalName = config.GetString("ExternalHostName", "SYSTEMIP");
+                externalName = config.GetString("ExternalHostName", "localhost");
             }
             else
             {
-                externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP");
+                externalName = MainConsole.Instance.CmdPrompt("External host name", "localhost");
                 config.Set("ExternalHostName", externalName);
             }
 
-            if (externalName == "SYSTEMIP")
+            if (externalName == "localhost")
                 m_externalHostName = Util.GetLocalHost().ToString();
             else
                 m_externalHostName = externalName;
@@ -788,7 +788,7 @@ namespace OpenSim.Framework
                     m_allow_alternate_ports = (bool) configuration_result;
                     break;
                 case "external_host_name":
-                    if ((string) configuration_result != "SYSTEMIP")
+                    if ((string) configuration_result != "localhost")
                     {
                         m_externalHostName = (string) configuration_result;
                     }
-- 
cgit v1.1


From 92f8f3e9d278455aca1e36e40c58ac529069bdef Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 18 Feb 2010 03:31:06 +0000
Subject: Revert "change "SYSTEMIP" to "localhost" in the create region console
 command prompt" after speaking to Dahlia

This reverts commit c62a6adb2b234fcbe99e352f4bd2af0cbf683a99.
---
 OpenSim/Framework/RegionInfo.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ee5dd37..88b62e0 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -474,15 +474,15 @@ namespace OpenSim.Framework
 
             if (config.Contains("ExternalHostName"))
             {
-                externalName = config.GetString("ExternalHostName", "localhost");
+                externalName = config.GetString("ExternalHostName", "SYSTEMIP");
             }
             else
             {
-                externalName = MainConsole.Instance.CmdPrompt("External host name", "localhost");
+                externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP");
                 config.Set("ExternalHostName", externalName);
             }
 
-            if (externalName == "localhost")
+            if (externalName == "SYSTEMIP")
                 m_externalHostName = Util.GetLocalHost().ToString();
             else
                 m_externalHostName = externalName;
@@ -788,7 +788,7 @@ namespace OpenSim.Framework
                     m_allow_alternate_ports = (bool) configuration_result;
                     break;
                 case "external_host_name":
-                    if ((string) configuration_result != "localhost")
+                    if ((string) configuration_result != "SYSTEMIP")
                     {
                         m_externalHostName = (string) configuration_result;
                     }
-- 
cgit v1.1


From 842b68eeff7571d3c82415c65065bec3c95f34ea Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 18 Feb 2010 04:19:33 +0000
Subject: Change handling of the SYSTEMIP constant to be more sane. This will
 now choose the first network interface IP address, or the loopback interface
 if no external interfaces are found. It will log the IP address used as
 [NETWORK]: Using x.x.x.x for SYSTEMIP.

---
 OpenSim/Framework/RegionInfo.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 88b62e0..baef32a 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -487,7 +487,6 @@ namespace OpenSim.Framework
             else
                 m_externalHostName = externalName;
 
-
             // Master avatar cruft
             //
             string masterAvatarUUID;
-- 
cgit v1.1