aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2012-01-28 10:36:39 -0500
committerBlueWall2012-01-28 10:36:39 -0500
commitae057a7589c3c2fa5f12e028db8ddc3e7832e92c (patch)
tree8b10680630549f98895fbb935f7f0480b9c159b6 /OpenSim
parentSend CHANGED_TELEPORT during local TP again - partially revert cf73afec356eed... (diff)
downloadopensim-SC_OLD-ae057a7589c3c2fa5f12e028db8ddc3e7832e92c.zip
opensim-SC_OLD-ae057a7589c3c2fa5f12e028db8ddc3e7832e92c.tar.gz
opensim-SC_OLD-ae057a7589c3c2fa5f12e028db8ddc3e7832e92c.tar.bz2
opensim-SC_OLD-ae057a7589c3c2fa5f12e028db8ddc3e7832e92c.tar.xz
Adding our parcel's generated id to map packets
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 4ae96f0..eac2743 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
464 mapitem.x = (uint)(xstart + x); 464 mapitem.x = (uint)(xstart + x);
465 mapitem.y = (uint)(ystart + y); 465 mapitem.y = (uint)(ystart + y);
466 // mapitem.z = (uint)m_scene.GetGroundHeight(x,y); 466 // mapitem.z = (uint)m_scene.GetGroundHeight(x,y);
467 mapitem.id = UUID.Zero; 467 mapitem.id = parcel.GlobalID;
468 mapitem.name = parcel.Name; 468 mapitem.name = parcel.Name;
469 mapitem.Extra = parcel.Area; 469 mapitem.Extra = parcel.Area;
470 mapitem.Extra2 = parcel.SalePrice; 470 mapitem.Extra2 = parcel.SalePrice;
@@ -1291,7 +1291,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1291 responsemapdata["X"] = OSD.FromInteger((int)(xstart + x)); 1291 responsemapdata["X"] = OSD.FromInteger((int)(xstart + x));
1292 responsemapdata["Y"] = OSD.FromInteger((int)(ystart + y)); 1292 responsemapdata["Y"] = OSD.FromInteger((int)(ystart + y));
1293 // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y)); 1293 // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y));
1294 responsemapdata["ID"] = OSD.FromUUID(UUID.Zero); 1294 responsemapdata["ID"] = OSD.FromUUID(parcel.GlobalID);
1295 responsemapdata["Name"] = OSD.FromString(parcel.Name); 1295 responsemapdata["Name"] = OSD.FromString(parcel.Name);
1296 responsemapdata["Extra"] = OSD.FromInteger(parcel.Area); 1296 responsemapdata["Extra"] = OSD.FromInteger(parcel.Area);
1297 responsemapdata["Extra2"] = OSD.FromInteger(parcel.SalePrice); 1297 responsemapdata["Extra2"] = OSD.FromInteger(parcel.SalePrice);