diff options
author | Melanie | 2010-02-18 03:31:06 +0000 |
---|---|---|
committer | Melanie | 2010-02-18 03:31:06 +0000 |
commit | 92f8f3e9d278455aca1e36e40c58ac529069bdef (patch) | |
tree | df51e6fa4d252d7f763c04fbd5f849e8421ca3d8 | |
parent | change "SYSTEMIP" to "localhost" in the create region console command prompt (diff) | |
download | opensim-SC_OLD-92f8f3e9d278455aca1e36e40c58ac529069bdef.zip opensim-SC_OLD-92f8f3e9d278455aca1e36e40c58ac529069bdef.tar.gz opensim-SC_OLD-92f8f3e9d278455aca1e36e40c58ac529069bdef.tar.bz2 opensim-SC_OLD-92f8f3e9d278455aca1e36e40c58ac529069bdef.tar.xz |
Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia
This reverts commit c62a6adb2b234fcbe99e352f4bd2af0cbf683a99.
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
474 | 474 | ||
475 | if (config.Contains("ExternalHostName")) | 475 | if (config.Contains("ExternalHostName")) |
476 | { | 476 | { |
477 | externalName = config.GetString("ExternalHostName", "localhost"); | 477 | externalName = config.GetString("ExternalHostName", "SYSTEMIP"); |
478 | } | 478 | } |
479 | else | 479 | else |
480 | { | 480 | { |
481 | externalName = MainConsole.Instance.CmdPrompt("External host name", "localhost"); | 481 | externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP"); |
482 | config.Set("ExternalHostName", externalName); | 482 | config.Set("ExternalHostName", externalName); |
483 | } | 483 | } |
484 | 484 | ||
485 | if (externalName == "localhost") | 485 | if (externalName == "SYSTEMIP") |
486 | m_externalHostName = Util.GetLocalHost().ToString(); | 486 | m_externalHostName = Util.GetLocalHost().ToString(); |
487 | else | 487 | else |
488 | m_externalHostName = externalName; | 488 | m_externalHostName = externalName; |
@@ -788,7 +788,7 @@ namespace OpenSim.Framework | |||
788 | m_allow_alternate_ports = (bool) configuration_result; | 788 | m_allow_alternate_ports = (bool) configuration_result; |
789 | break; | 789 | break; |
790 | case "external_host_name": | 790 | case "external_host_name": |
791 | if ((string) configuration_result != "localhost") | 791 | if ((string) configuration_result != "SYSTEMIP") |
792 | { | 792 | { |
793 | m_externalHostName = (string) configuration_result; | 793 | m_externalHostName = (string) configuration_result; |
794 | } | 794 | } |