From b99455d23d57d10c221929a9233520026aed2cd4 Mon Sep 17 00:00:00 2001
From: Johan Berntsson
Date: Fri, 7 Mar 2008 08:10:52 +0000
Subject: Fix to solve mantis 717 problem. Makes sure the region DB schema is
 up to date and consistent

---
 OpenSim/Region/Application/OpenSimMain.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Application')

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
         public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
         {
             int port = regionInfo.InternalEndPoint.Port;
-            if ((proxyOffset != 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 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();
+            // 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;
                 ProxyCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
             }
+
             UDPServer udpServer;
             Scene scene = SetupScene(regionInfo, proxyOffset, out udpServer, m_permissions);
 
-- 
cgit v1.1