aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-02-18 04:19:33 +0000
committerMelanie2010-02-18 04:19:33 +0000
commit842b68eeff7571d3c82415c65065bec3c95f34ea (patch)
tree5980e497c3f3fc5acb9bd549e4b050268a92f2b4 /OpenSim/Region
parentRevert "change "SYSTEMIP" to "localhost" in the create region console command... (diff)
downloadopensim-SC-842b68eeff7571d3c82415c65065bec3c95f34ea.zip
opensim-SC-842b68eeff7571d3c82415c65065bec3c95f34ea.tar.gz
opensim-SC-842b68eeff7571d3c82415c65065bec3c95f34ea.tar.bz2
opensim-SC-842b68eeff7571d3c82415c65065bec3c95f34ea.tar.xz
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.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 96eceb0..05e283e 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -190,6 +190,8 @@ namespace OpenSim
190 190
191 PrintFileToConsole("startuplogo.txt"); 191 PrintFileToConsole("startuplogo.txt");
192 192
193 m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString());
194
193 // For now, start at the 'root' level by default 195 // For now, start at the 'root' level by default
194 if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it 196 if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
195 ChangeSelectedRegion("region", 197 ChangeSelectedRegion("region",