diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:01 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:01 +0100 |
| commit | 8f34e46d7449be1c29419a232a8f7f1e5918f03c (patch) | |
| tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Revert "* additional serveruri cleanup" (diff) | |
| download | opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.zip opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.gz opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.bz2 opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.xz | |
Revert "* refactor refactor refactor ServerURI 4 lyfe"
This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
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 f30a850..74ad168 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; | ||
| 330 | regionInfo.HttpPort = m_httpServerPort; | 331 | 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 | ||