diff options
| author | Melanie | 2010-10-21 07:33:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 07:33:01 +0100 |
| commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
| tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Region/Application | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| parent | Skip empty strings in ParseString* functions (diff) | |
| download | opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 c5ee385..7e0a886 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -336,8 +336,8 @@ namespace OpenSim | |||
| 336 | //regionInfo.originRegionID = regionInfo.RegionID; | 336 | //regionInfo.originRegionID = regionInfo.RegionID; |
| 337 | 337 | ||
| 338 | // set initial ServerURI | 338 | // set initial ServerURI |
| 339 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port; | ||
| 340 | regionInfo.HttpPort = m_httpServerPort; | 339 | regionInfo.HttpPort = m_httpServerPort; |
| 340 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/"; | ||
| 341 | 341 | ||
| 342 | regionInfo.osSecret = m_osSecret; | 342 | regionInfo.osSecret = m_osSecret; |
| 343 | 343 | ||