ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-12-07 01:07:57 +01:00
parent b960a05e67 45314c6622
commit b325721d6f
28 changed files with 243 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -342,8 +342,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;