aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-01-30 20:11:47 +0000
committerMelanie2012-01-30 20:11:47 +0000
commitbde2ff5e78360061be89e4c5717f4d67248d9185 (patch)
tree0552dfb8f04cc1208d8bae9b31d2efebb1b5d946 /OpenSim/Services
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.zip
opensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.tar.gz
opensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.tar.bz2
opensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.tar.xz
Next step for world map overlays
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 7137f9a..d809996 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -190,6 +190,7 @@ namespace OpenSim.Services.Interfaces
190 public UUID ScopeID = UUID.Zero; 190 public UUID ScopeID = UUID.Zero;
191 191
192 public UUID TerrainImage = UUID.Zero; 192 public UUID TerrainImage = UUID.Zero;
193 public UUID ParcelImage = UUID.Zero;
193 public byte Access; 194 public byte Access;
194 public int Maturity; 195 public int Maturity;
195 public string RegionSecret = string.Empty; 196 public string RegionSecret = string.Empty;
@@ -236,6 +237,7 @@ namespace OpenSim.Services.Interfaces
236 RegionID = ConvertFrom.RegionID; 237 RegionID = ConvertFrom.RegionID;
237 ServerURI = ConvertFrom.ServerURI; 238 ServerURI = ConvertFrom.ServerURI;
238 TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; 239 TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
240 ParcelImage = ConvertFrom.RegionSettings.ParcelImageID;
239 Access = ConvertFrom.AccessLevel; 241 Access = ConvertFrom.AccessLevel;
240 Maturity = ConvertFrom.RegionSettings.Maturity; 242 Maturity = ConvertFrom.RegionSettings.Maturity;
241 RegionSecret = ConvertFrom.regionSecret; 243 RegionSecret = ConvertFrom.regionSecret;
@@ -253,6 +255,7 @@ namespace OpenSim.Services.Interfaces
253 RegionID = ConvertFrom.RegionID; 255 RegionID = ConvertFrom.RegionID;
254 ServerURI = ConvertFrom.ServerURI; 256 ServerURI = ConvertFrom.ServerURI;
255 TerrainImage = ConvertFrom.TerrainImage; 257 TerrainImage = ConvertFrom.TerrainImage;
258 ParcelImage = ConvertFrom.ParcelImage;
256 Access = ConvertFrom.Access; 259 Access = ConvertFrom.Access;
257 Maturity = ConvertFrom.Maturity; 260 Maturity = ConvertFrom.Maturity;
258 RegionSecret = ConvertFrom.RegionSecret; 261 RegionSecret = ConvertFrom.RegionSecret;
@@ -281,7 +284,7 @@ namespace OpenSim.Services.Interfaces
281 284
282 public override int GetHashCode() 285 public override int GetHashCode()
283 { 286 {
284 return RegionID.GetHashCode() ^ TerrainImage.GetHashCode(); 287 return RegionID.GetHashCode() ^ TerrainImage.GetHashCode() ^ ParcelImage.GetHashCode();
285 } 288 }
286 289
287 #endregion 290 #endregion
@@ -359,6 +362,7 @@ namespace OpenSim.Services.Interfaces
359 kvp["serverURI"] = ServerURI; 362 kvp["serverURI"] = ServerURI;
360 kvp["serverPort"] = InternalEndPoint.Port.ToString(); 363 kvp["serverPort"] = InternalEndPoint.Port.ToString();
361 kvp["regionMapTexture"] = TerrainImage.ToString(); 364 kvp["regionMapTexture"] = TerrainImage.ToString();
365 kvp["parcelMapTexture"] = ParcelImage.ToString();
362 kvp["access"] = Access.ToString(); 366 kvp["access"] = Access.ToString();
363 kvp["regionSecret"] = RegionSecret; 367 kvp["regionSecret"] = RegionSecret;
364 kvp["owner_uuid"] = EstateOwner.ToString(); 368 kvp["owner_uuid"] = EstateOwner.ToString();
@@ -411,6 +415,9 @@ namespace OpenSim.Services.Interfaces
411 if (kvp.ContainsKey("regionMapTexture")) 415 if (kvp.ContainsKey("regionMapTexture"))
412 UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage); 416 UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
413 417
418 if (kvp.ContainsKey("parcelMapTexture"))
419 UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
420
414 if (kvp.ContainsKey("access")) 421 if (kvp.ContainsKey("access"))
415 Access = Byte.Parse((string)kvp["access"]); 422 Access = Byte.Parse((string)kvp["access"]);
416 423