* 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, 14 insertions, 1 deletions

diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 5476233..7dd4a41 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -282,7 +282,20 @@ namespace OpenSim.Data
 
         public RegionInfo ToRegionInfo( )
         {
-            return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort);
+            return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI );
+        }
+
+        public static RegionProfileData FromRegionInfo( RegionInfo regionInfo )
+        {
+            if( regionInfo == null )
+            {
+                return null;
+            }
+
+            return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX,
+                                         regionInfo.RegionLocY, regionInfo.ExternalHostName,
+                                         (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort,
+                                         regionInfo.ServerURI);
         }
 
         public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri)