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

Fix to solve mantis 717 problem. Makes sure the region DB schema is up to date and consistent

Browse Source
This commit is contained in:
Johan Berntsson
2008-03-07 08:10:52 +00:00
parent c9eb051936
commit b99455d23d
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -470,20 +470,21 @@ namespace OpenSim
public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
{
int port = regionInfo.InternalEndPoint.Port;
if ((proxyOffset != 0) && (portadd_flag))
// set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims)
regionInfo.originRegionID = regionInfo.RegionID;
// set initial ServerURI
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName
+ ":" + regionInfo.InternalEndPoint.Port.ToString();
if ((proxyUrl.Length > 0) && (portadd_flag))
{
// set proxy url to RegionInfo
regionInfo.proxyUrl = proxyUrl;
// set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims)
regionInfo.originRegionID = regionInfo.RegionID;
// set initial ServerURI
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName
+ ":" + regionInfo.InternalEndPoint.Port.ToString();
ProxyCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
}
UDPServer udpServer;
Scene scene = SetupScene(regionInfo, proxyOffset, out udpServer, m_permissions);