* Another stab at refactoring up the CustomiseResponse function. Two fixes:

  * Sometimes, null is a valid return value to indicate 'none found'. doh.
  * Sometimes, the Grid server does not send simURI - this you need to reconstruct yourself. Euw.

(I believe) this solves mantis issue #3287

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index c958c68..202b587 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -676,7 +676,7 @@ namespace OpenSim.Framework
                 proxyUrl = args["proxy_url"].AsString();
         }
 
-        public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort)
+        public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI)
         {
             RegionInfo regionInfo;
             IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);                    
@@ -686,6 +686,7 @@ namespace OpenSim.Framework
             regionInfo.HttpPort = httpPort;
             regionInfo.RegionID = regionID;
             regionInfo.RegionName = regionName;
+            regionInfo.ServerURI = serverURI;
             return regionInfo;
         }
     }