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

Next step for world map overlays

iar_mods
Melanie 2012-01-30 20:11:47 +00:00
parent ea16c9f858
commit bde2ff5e78
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
foreach (GridRegion r in regions) foreach (GridRegion r in regions)
{ {
MapBlockData block = new MapBlockData(); MapBlockData block = new MapBlockData();
MapBlockFromGridRegion(block, r); MapBlockFromGridRegion(block, r, 0);
mapBlocks.Add(block); mapBlocks.Add(block);
} }
avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0); avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
@ -990,7 +990,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
response.Add(block); response.Add(block);
} }
// The lower 16 bits are an unsigned int16 // The lower 16 bits are an unsigned int16
remoteClient.SendMapBlock(response, flags & 0xffff); remoteClient.SendMapBlock(response, flag & 0xffff);
} }
else else
{ {
@ -1031,6 +1031,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
break; break;
default: default:
block.MapImageId = UUID.Zero; block.MapImageId = UUID.Zero;
break;
} }
block.Name = r.RegionName; block.Name = r.RegionName;
block.X = (ushort)(r.RegionLocX / Constants.RegionSize); block.X = (ushort)(r.RegionLocX / Constants.RegionSize);

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

@ -190,6 +190,7 @@ namespace OpenSim.Services.Interfaces
public UUID ScopeID = UUID.Zero; public UUID ScopeID = UUID.Zero;
public UUID TerrainImage = UUID.Zero; public UUID TerrainImage = UUID.Zero;
public UUID ParcelImage = UUID.Zero;
public byte Access; public byte Access;
public int Maturity; public int Maturity;
public string RegionSecret = string.Empty; public string RegionSecret = string.Empty;
@ -236,6 +237,7 @@ namespace OpenSim.Services.Interfaces
RegionID = ConvertFrom.RegionID; RegionID = ConvertFrom.RegionID;
ServerURI = ConvertFrom.ServerURI; ServerURI = ConvertFrom.ServerURI;
TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
ParcelImage = ConvertFrom.RegionSettings.ParcelImageID;
Access = ConvertFrom.AccessLevel; Access = ConvertFrom.AccessLevel;
Maturity = ConvertFrom.RegionSettings.Maturity; Maturity = ConvertFrom.RegionSettings.Maturity;
RegionSecret = ConvertFrom.regionSecret; RegionSecret = ConvertFrom.regionSecret;
@ -253,6 +255,7 @@ namespace OpenSim.Services.Interfaces
RegionID = ConvertFrom.RegionID; RegionID = ConvertFrom.RegionID;
ServerURI = ConvertFrom.ServerURI; ServerURI = ConvertFrom.ServerURI;
TerrainImage = ConvertFrom.TerrainImage; TerrainImage = ConvertFrom.TerrainImage;
ParcelImage = ConvertFrom.ParcelImage;
Access = ConvertFrom.Access; Access = ConvertFrom.Access;
Maturity = ConvertFrom.Maturity; Maturity = ConvertFrom.Maturity;
RegionSecret = ConvertFrom.RegionSecret; RegionSecret = ConvertFrom.RegionSecret;
@ -281,7 +284,7 @@ namespace OpenSim.Services.Interfaces
public override int GetHashCode() public override int GetHashCode()
{ {
return RegionID.GetHashCode() ^ TerrainImage.GetHashCode(); return RegionID.GetHashCode() ^ TerrainImage.GetHashCode() ^ ParcelImage.GetHashCode();
} }
#endregion #endregion
@ -359,6 +362,7 @@ namespace OpenSim.Services.Interfaces
kvp["serverURI"] = ServerURI; kvp["serverURI"] = ServerURI;
kvp["serverPort"] = InternalEndPoint.Port.ToString(); kvp["serverPort"] = InternalEndPoint.Port.ToString();
kvp["regionMapTexture"] = TerrainImage.ToString(); kvp["regionMapTexture"] = TerrainImage.ToString();
kvp["parcelMapTexture"] = ParcelImage.ToString();
kvp["access"] = Access.ToString(); kvp["access"] = Access.ToString();
kvp["regionSecret"] = RegionSecret; kvp["regionSecret"] = RegionSecret;
kvp["owner_uuid"] = EstateOwner.ToString(); kvp["owner_uuid"] = EstateOwner.ToString();
@ -411,6 +415,9 @@ namespace OpenSim.Services.Interfaces
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("parcelMapTexture"))
UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
if (kvp.ContainsKey("access")) if (kvp.ContainsKey("access"))
Access = Byte.Parse((string)kvp["access"]); Access = Byte.Parse((string)kvp["access"]);