diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
| commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
| tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
| download | opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz | |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to '')
| -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 904a50c..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 | ||