diff options
| author | opensim mirror account | 2010-10-22 16:00:06 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-22 16:00:06 -0700 |
| commit | bf5cc32b5f87de786ea764021571b2bdcf1e64cd (patch) | |
| tree | 86f05bdff474bc42ee90a7e1d3dcfc508ab2bc04 /OpenSim/Region/Application | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.zip opensim-SC_OLD-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.gz opensim-SC_OLD-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.bz2 opensim-SC_OLD-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Application')
| -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 | ||