diff options
| author | Melanie | 2012-01-29 22:50:59 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-29 22:50:59 +0000 |
| commit | 9a86a713d3fa71d00328ee6d005bb0c37a76f214 (patch) | |
| tree | 0aa5d98a226548d45bd7fed54bc80a104ca6bc2e /OpenSim/Region/CoreModules/World/WorldMap | |
| parent | Make all NPCs owned by default (diff) | |
| parent | Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/... (diff) | |
| download | opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.zip opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.gz opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.bz2 opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 |
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 3c1b3e0..9a763ee 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); |