OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

0.6.8-post-fixes
Diva Canto 2009-09-28 07:20:38 -07:00
parent 69da82b39f
commit 500cd3505a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Services/Interfaces/IGridService.cs
View File

@ -146,6 +146,7 @@ namespace OpenSim.Services.Interfaces
public UUID TerrainImage = UUID.Zero; public UUID TerrainImage = UUID.Zero;
public byte Access; public byte Access;
public int Maturity; public int Maturity;
public string RegionSecret;
public GridRegion() public GridRegion()
{ {
@ -189,6 +190,7 @@ namespace OpenSim.Services.Interfaces
TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
Access = ConvertFrom.AccessLevel; Access = ConvertFrom.AccessLevel;
Maturity = ConvertFrom.RegionSettings.Maturity; Maturity = ConvertFrom.RegionSettings.Maturity;
RegionSecret = ConvertFrom.regionSecret;
} }
public GridRegion(GridRegion ConvertFrom) public GridRegion(GridRegion ConvertFrom)
@ -204,6 +206,7 @@ namespace OpenSim.Services.Interfaces
TerrainImage = ConvertFrom.TerrainImage; TerrainImage = ConvertFrom.TerrainImage;
Access = ConvertFrom.Access; Access = ConvertFrom.Access;
Maturity = ConvertFrom.Maturity; Maturity = ConvertFrom.Maturity;
RegionSecret = ConvertFrom.RegionSecret;
} }
/// <value> /// <value>
@ -287,6 +290,7 @@ namespace OpenSim.Services.Interfaces
kvp["serverPort"] = InternalEndPoint.Port.ToString(); kvp["serverPort"] = InternalEndPoint.Port.ToString();
kvp["regionMapTexture"] = TerrainImage.ToString(); kvp["regionMapTexture"] = TerrainImage.ToString();
kvp["access"] = Access.ToString(); kvp["access"] = Access.ToString();
kvp["regionSecret"] = RegionSecret;
// Maturity doesn't seem to exist in the DB // Maturity doesn't seem to exist in the DB
return kvp; return kvp;
} }
@ -333,14 +337,14 @@ namespace OpenSim.Services.Interfaces
ServerURI = (string)kvp["serverURI"]; ServerURI = (string)kvp["serverURI"];
if (kvp.ContainsKey("regionMapTexture")) if (kvp.ContainsKey("regionMapTexture"))
{
UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage); UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
}
if (kvp.ContainsKey("access")) if (kvp.ContainsKey("access"))
{ Access = Byte.Parse((string)kvp["access"]);
Access = Byte.Parse((string)kvp["access"]); ;
} if (kvp.ContainsKey("regionSecret"))
RegionSecret =(string)kvp["regionSecret"];
} }
} }