aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 07:20:38 -0700
committerDiva Canto2009-09-28 07:20:38 -0700
commit500cd3505a4213363e001426f2286c1a958d345c (patch)
tree03960993e159f428aa45a6abebc34ecb2a855547 /OpenSim
parentBug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which... (diff)
downloadopensim-SC-500cd3505a4213363e001426f2286c1a958d345c.zip
opensim-SC-500cd3505a4213363e001426f2286c1a958d345c.tar.gz
opensim-SC-500cd3505a4213363e001426f2286c1a958d345c.tar.bz2
opensim-SC-500cd3505a4213363e001426f2286c1a958d345c.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs14
1 files 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
146 public UUID TerrainImage = UUID.Zero; 146 public UUID TerrainImage = UUID.Zero;
147 public byte Access; 147 public byte Access;
148 public int Maturity; 148 public int Maturity;
149 public string RegionSecret;
149 150
150 public GridRegion() 151 public GridRegion()
151 { 152 {
@@ -189,6 +190,7 @@ namespace OpenSim.Services.Interfaces
189 TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; 190 TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
190 Access = ConvertFrom.AccessLevel; 191 Access = ConvertFrom.AccessLevel;
191 Maturity = ConvertFrom.RegionSettings.Maturity; 192 Maturity = ConvertFrom.RegionSettings.Maturity;
193 RegionSecret = ConvertFrom.regionSecret;
192 } 194 }
193 195
194 public GridRegion(GridRegion ConvertFrom) 196 public GridRegion(GridRegion ConvertFrom)
@@ -204,6 +206,7 @@ namespace OpenSim.Services.Interfaces
204 TerrainImage = ConvertFrom.TerrainImage; 206 TerrainImage = ConvertFrom.TerrainImage;
205 Access = ConvertFrom.Access; 207 Access = ConvertFrom.Access;
206 Maturity = ConvertFrom.Maturity; 208 Maturity = ConvertFrom.Maturity;
209 RegionSecret = ConvertFrom.RegionSecret;
207 } 210 }
208 211
209 /// <value> 212 /// <value>
@@ -287,6 +290,7 @@ namespace OpenSim.Services.Interfaces
287 kvp["serverPort"] = InternalEndPoint.Port.ToString(); 290 kvp["serverPort"] = InternalEndPoint.Port.ToString();
288 kvp["regionMapTexture"] = TerrainImage.ToString(); 291 kvp["regionMapTexture"] = TerrainImage.ToString();
289 kvp["access"] = Access.ToString(); 292 kvp["access"] = Access.ToString();
293 kvp["regionSecret"] = RegionSecret;
290 // Maturity doesn't seem to exist in the DB 294 // Maturity doesn't seem to exist in the DB
291 return kvp; 295 return kvp;
292 } 296 }
@@ -333,14 +337,14 @@ namespace OpenSim.Services.Interfaces
333 ServerURI = (string)kvp["serverURI"]; 337 ServerURI = (string)kvp["serverURI"];
334 338
335 if (kvp.ContainsKey("regionMapTexture")) 339 if (kvp.ContainsKey("regionMapTexture"))
336 {
337 UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage); 340 UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
338 }
339 341
340 if (kvp.ContainsKey("access")) 342 if (kvp.ContainsKey("access"))
341 { 343 Access = Byte.Parse((string)kvp["access"]);
342 Access = Byte.Parse((string)kvp["access"]); ; 344
343 } 345 if (kvp.ContainsKey("regionSecret"))
346 RegionSecret =(string)kvp["regionSecret"];
347
344 } 348 }
345 } 349 }
346 350