1 files changed, 40 insertions, 7 deletions

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index ce432ab..2290530 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionID"></param>
         /// <returns></returns>
         /// <exception cref="System.Exception">Thrown if region deregistration failed</exception>
-        bool DeregisterRegion(UUID regionID);   
+        bool DeregisterRegion(UUID regionID);
 
         /// <summary>
         /// Get information about the regions neighbouring the given co-ordinates (in meters).
@@ -122,9 +122,6 @@ namespace OpenSim.Services.Interfaces
         }
         protected string m_regionName = String.Empty;
 
-        protected bool Allow_Alternate_Ports;
-        public bool m_allow_alternate_ports;
-
         protected string m_externalHostName;
 
         protected IPEndPoint m_internalEndPoint;
@@ -146,6 +143,11 @@ namespace OpenSim.Services.Interfaces
         public UUID RegionID = UUID.Zero;
         public UUID ScopeID = UUID.Zero;
 
+        public UUID TerrainImage = UUID.Zero;
+        public byte Access;
+        public int  Maturity;
+        public string RegionSecret;
+
         public GridRegion()
         {
         }
@@ -183,11 +185,29 @@ namespace OpenSim.Services.Interfaces
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
             m_httpPort = ConvertFrom.HttpPort;
-            m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
-            RegionID = UUID.Zero;
+            RegionID = ConvertFrom.RegionID;
             ServerURI = ConvertFrom.ServerURI;
+            TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
+            Access = ConvertFrom.AccessLevel;
+            Maturity = ConvertFrom.RegionSettings.Maturity;
+            RegionSecret = ConvertFrom.regionSecret;
         }
 
+        public GridRegion(GridRegion ConvertFrom)
+        {
+            m_regionName = ConvertFrom.RegionName;
+            m_regionLocX = ConvertFrom.RegionLocX;
+            m_regionLocY = ConvertFrom.RegionLocY;
+            m_internalEndPoint = ConvertFrom.InternalEndPoint;
+            m_externalHostName = ConvertFrom.ExternalHostName;
+            m_httpPort = ConvertFrom.HttpPort;
+            RegionID = ConvertFrom.RegionID;
+            ServerURI = ConvertFrom.ServerURI;
+            TerrainImage = ConvertFrom.TerrainImage;
+            Access = ConvertFrom.Access;
+            Maturity = ConvertFrom.Maturity;
+            RegionSecret = ConvertFrom.RegionSecret;
+        }
 
         /// <value>
         /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
@@ -268,7 +288,10 @@ namespace OpenSim.Services.Interfaces
             kvp["serverHttpPort"] = HttpPort.ToString();
             kvp["serverURI"] = ServerURI;
             kvp["serverPort"] = InternalEndPoint.Port.ToString();
-
+            kvp["regionMapTexture"] = TerrainImage.ToString();
+            kvp["access"] = Access.ToString();
+            kvp["regionSecret"] = RegionSecret;
+            // Maturity doesn't seem to exist in the DB
             return kvp;
         }
 
@@ -312,6 +335,16 @@ namespace OpenSim.Services.Interfaces
 
             if (kvp.ContainsKey("serverURI"))
                 ServerURI = (string)kvp["serverURI"];
+
+            if (kvp.ContainsKey("regionMapTexture"))
+                UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
+
+            if (kvp.ContainsKey("access"))
+                Access = Byte.Parse((string)kvp["access"]);
+
+            if (kvp.ContainsKey("regionSecret"))
+                RegionSecret =(string)kvp["regionSecret"];
+
         }
     }