aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJohan Berntsson2008-03-07 08:10:52 +0000
committerJohan Berntsson2008-03-07 08:10:52 +0000
commitb99455d23d57d10c221929a9233520026aed2cd4 (patch)
tree681bea0b0dfcaf3c13c6d86afe9f7862138eca77 /OpenSim/Region/Application
parent* Fix for exception in landmanager crash. (diff)
downloadopensim-SC_OLD-b99455d23d57d10c221929a9233520026aed2cd4.zip
opensim-SC_OLD-b99455d23d57d10c221929a9233520026aed2cd4.tar.gz
opensim-SC_OLD-b99455d23d57d10c221929a9233520026aed2cd4.tar.bz2
opensim-SC_OLD-b99455d23d57d10c221929a9233520026aed2cd4.tar.xz
Fix to solve mantis 717 problem. Makes sure the region DB schema is up to date and consistent
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs19
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 2c9e50e..ea25147 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -470,20 +470,21 @@ namespace OpenSim
470 public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag) 470 public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
471 { 471 {
472 int port = regionInfo.InternalEndPoint.Port; 472 int port = regionInfo.InternalEndPoint.Port;
473 if ((proxyOffset != 0) && (portadd_flag))
474 {
475 // set proxy url to RegionInfo
476 regionInfo.proxyUrl = proxyUrl;
477 473
478 // set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims) 474 // set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims)
479 regionInfo.originRegionID = regionInfo.RegionID; 475 regionInfo.originRegionID = regionInfo.RegionID;
480 476
481 // set initial ServerURI 477 // set initial ServerURI
482 regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName 478 regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName
483 + ":" + regionInfo.InternalEndPoint.Port.ToString(); 479 + ":" + regionInfo.InternalEndPoint.Port.ToString();
484 480
481 if ((proxyUrl.Length > 0) && (portadd_flag))
482 {
483 // set proxy url to RegionInfo
484 regionInfo.proxyUrl = proxyUrl;
485 ProxyCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName); 485 ProxyCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
486 } 486 }
487
487 UDPServer udpServer; 488 UDPServer udpServer;
488 Scene scene = SetupScene(regionInfo, proxyOffset, out udpServer, m_permissions); 489 Scene scene = SetupScene(regionInfo, proxyOffset, out udpServer, m_permissions);
489 490