aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorMelanie2010-12-07 01:07:57 +0100
committerMelanie2010-12-07 01:07:57 +0100
commitb325721d6f8e5915b2c77a76c9ed14e15a4e1645 (patch)
treed67b6bc610c0651e1e58225fdf7ae8fe11995d62 /OpenSim/Region/Application/OpenSimBase.cs
parentCowardly refuse to keep running when no application plugins are loaded. (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.zip
opensim-SC_OLD-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.tar.gz
opensim-SC_OLD-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.tar.bz2
opensim-SC_OLD-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 941472b..b74a392 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -342,8 +342,8 @@ namespace OpenSim
342 //regionInfo.originRegionID = regionInfo.RegionID; 342 //regionInfo.originRegionID = regionInfo.RegionID;
343 343
344 // set initial ServerURI 344 // set initial ServerURI
345 regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port;
346 regionInfo.HttpPort = m_httpServerPort; 345 regionInfo.HttpPort = m_httpServerPort;
346 regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/";
347 347
348 regionInfo.osSecret = m_osSecret; 348 regionInfo.osSecret = m_osSecret;
349 349