Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia
This reverts commit c62a6adb2b
.
0.6.9
parent
c62a6adb2b
commit
92f8f3e9d2
|
@ -474,15 +474,15 @@ namespace OpenSim.Framework
|
||||||
|
|
||||||
if (config.Contains("ExternalHostName"))
|
if (config.Contains("ExternalHostName"))
|
||||||
{
|
{
|
||||||
externalName = config.GetString("ExternalHostName", "localhost");
|
externalName = config.GetString("ExternalHostName", "SYSTEMIP");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
externalName = MainConsole.Instance.CmdPrompt("External host name", "localhost");
|
externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP");
|
||||||
config.Set("ExternalHostName", externalName);
|
config.Set("ExternalHostName", externalName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (externalName == "localhost")
|
if (externalName == "SYSTEMIP")
|
||||||
m_externalHostName = Util.GetLocalHost().ToString();
|
m_externalHostName = Util.GetLocalHost().ToString();
|
||||||
else
|
else
|
||||||
m_externalHostName = externalName;
|
m_externalHostName = externalName;
|
||||||
|
@ -788,7 +788,7 @@ namespace OpenSim.Framework
|
||||||
m_allow_alternate_ports = (bool) configuration_result;
|
m_allow_alternate_ports = (bool) configuration_result;
|
||||||
break;
|
break;
|
||||||
case "external_host_name":
|
case "external_host_name":
|
||||||
if ((string) configuration_result != "localhost")
|
if ((string) configuration_result != "SYSTEMIP")
|
||||||
{
|
{
|
||||||
m_externalHostName = (string) configuration_result;
|
m_externalHostName = (string) configuration_result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue