From 500cd3505a4213363e001426f2286c1a958d345c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Sep 2009 07:20:38 -0700
Subject: Added RegionSecret to GridRegion, and corresponding saving/retrieval
 from DB layer. This sounds fishy to me, but it's what's used to make external
 currency modules work, for now.

---
 OpenSim/Services/Interfaces/IGridService.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index c5495fb..46a7f09 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -146,6 +146,7 @@ namespace OpenSim.Services.Interfaces
         public UUID TerrainImage = UUID.Zero;
         public byte Access;
         public int  Maturity;
+        public string RegionSecret;
 
         public GridRegion()
         {
@@ -189,6 +190,7 @@ namespace OpenSim.Services.Interfaces
             TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
             Access = ConvertFrom.AccessLevel;
             Maturity = ConvertFrom.RegionSettings.Maturity;
+            RegionSecret = ConvertFrom.regionSecret;
         }
 
         public GridRegion(GridRegion ConvertFrom)
@@ -204,6 +206,7 @@ namespace OpenSim.Services.Interfaces
             TerrainImage = ConvertFrom.TerrainImage;
             Access = ConvertFrom.Access;
             Maturity = ConvertFrom.Maturity;
+            RegionSecret = ConvertFrom.RegionSecret;
         }
 
         /// <value>
@@ -287,6 +290,7 @@ namespace OpenSim.Services.Interfaces
             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;
         }
@@ -333,14 +337,14 @@ namespace OpenSim.Services.Interfaces
                 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"]); ;
-            }
+                Access = Byte.Parse((string)kvp["access"]);
+
+            if (kvp.ContainsKey("regionSecret"))
+                RegionSecret =(string)kvp["regionSecret"];
+
         }
     }
 
-- 
cgit v1.1