diff options
| author | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
| commit | 38e76d71ac8d60ca5228588d154b610857381a1c (patch) | |
| tree | 45a9cccf38765e8b6c41547373bdcaa91d01508f /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Fix llParcelMediaCommandList() so that it applies commands only to the parcel... (diff) | |
| parent | * change the data exchanged within hypergrid transactions (diff) | |
| download | opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.zip opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.gz opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.bz2 opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.xz | |
Merge branch 'hg16' into mantis5110
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 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 | ||