Revert "Merge remote branch 'otakup0pe/mantis5110'"

This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
This commit is contained in:
Justin Clark-Casey (justincc)
2010-10-22 23:52:07 +01:00
parent 21187f459e
commit fe8d3d5a2b
25 changed files with 193 additions and 214 deletions

View File

@@ -327,8 +327,8 @@ namespace OpenSim
//regionInfo.originRegionID = regionInfo.RegionID;
// set initial ServerURI
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port;
regionInfo.HttpPort = m_httpServerPort;
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/";
regionInfo.osSecret = m_osSecret;