aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General/Types
diff options
context:
space:
mode:
authorAdam Frisby2007-07-30 21:12:29 +0000
committerAdam Frisby2007-07-30 21:12:29 +0000
commite172e37c58c1d4ab48e3dcccacb8707c25e0d2bf (patch)
tree44b75ae525cf5b4da3ef1baec3dc8d21f772277e /OpenSim/Framework/General/Types
parentmass update of files to have native line endings (diff)
downloadopensim-SC_OLD-e172e37c58c1d4ab48e3dcccacb8707c25e0d2bf.zip
opensim-SC_OLD-e172e37c58c1d4ab48e3dcccacb8707c25e0d2bf.tar.gz
opensim-SC_OLD-e172e37c58c1d4ab48e3dcccacb8707c25e0d2bf.tar.bz2
opensim-SC_OLD-e172e37c58c1d4ab48e3dcccacb8707c25e0d2bf.tar.xz
* Added GetLocalHost() to Util
* ExternalHostName supports "SYSTEMIP" again.
Diffstat (limited to 'OpenSim/Framework/General/Types')
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 57bb398..ef05534 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -207,7 +207,14 @@ namespace OpenSim.Framework.Types
207 this.m_internalEndPoint.Port = (int)configuration_result; 207 this.m_internalEndPoint.Port = (int)configuration_result;
208 break; 208 break;
209 case "external_host_name": 209 case "external_host_name":
210 this.m_externalHostName = (string)configuration_result; 210 if ((string)configuration_result != "SYSTEMIP")
211 {
212 this.m_externalHostName = (string)configuration_result;
213 }
214 else
215 {
216 this.m_externalHostName = Util.GetLocalHost().ToString();
217 }
211 break; 218 break;
212 case "terrain_file": 219 case "terrain_file":
213 this.estateSettings.terrainFile = (string)configuration_result; 220 this.estateSettings.terrainFile = (string)configuration_result;