diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
| commit | 21187f459ea2ae590dda4249fa15ebf116d04fe0 (patch) | |
| tree | 48cfec3b73bdbf54f7bc22059044b92271deedc1 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Revert "* refactor refactor refactor ServerURI 4 lyfe" (diff) | |
| parent | Merge branch 'hg16' into mantis5110 (diff) | |
| download | opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.zip opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.gz opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.bz2 opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.xz | |
Merge remote branch 'otakup0pe/mantis5110'
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 74ad168..904a50c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -327,8 +327,8 @@ namespace OpenSim | |||
| 327 | //regionInfo.originRegionID = regionInfo.RegionID; | 327 | //regionInfo.originRegionID = regionInfo.RegionID; |
| 328 | 328 | ||
| 329 | // set initial ServerURI | 329 | // set initial ServerURI |
| 330 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port; | ||
| 331 | regionInfo.HttpPort = m_httpServerPort; | 330 | regionInfo.HttpPort = m_httpServerPort; |
| 331 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/"; | ||
| 332 | 332 | ||
| 333 | regionInfo.osSecret = m_osSecret; | 333 | regionInfo.osSecret = m_osSecret; |
| 334 | 334 | ||