* Refactored out Create() methods to ensure proper transformation between RegionProfileData and RegionInfo

* Created ToRegionInfo method, still not using it pending peer review. 
* This is a preparatory commit for a subsequent login service refactoring.

1 files changed, 25 insertions, 1 deletions

diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 0b757f3..5476233 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -279,6 +279,30 @@ namespace OpenSim.Data
             get { return originUUID; }
             set { originUUID = value; }
         }
-        
+
+        public RegionInfo ToRegionInfo( )
+        {
+            return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort);
+        }
+
+        public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri)
+        {
+            RegionProfileData regionProfile;
+            regionProfile = new RegionProfileData();
+            regionProfile.regionLocX = locX;
+            regionProfile.regionLocY = locY;
+            regionProfile.regionHandle =
+                Utils.UIntsToLong((regionProfile.regionLocX * Constants.RegionSize),
+                                  (regionProfile.regionLocY*Constants.RegionSize));
+            regionProfile.serverIP = externalHostName;
+            regionProfile.serverPort = regionPort;
+            regionProfile.httpPort = httpPort;
+            regionProfile.remotingPort = remotingPort;
+            regionProfile.serverURI = serverUri;
+            regionProfile.httpServerURI = "http://" + externalHostName + ":" + httpPort + "/";
+            regionProfile.UUID = regionID;
+            regionProfile.regionName = regionName;
+            return regionProfile;
+        }
     }
 }