diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 81b433f..1a9313b 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1301,19 +1301,22 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1301 | 1301 | ||
1302 | if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) | 1302 | if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) |
1303 | { | 1303 | { |
1304 | SceneObjectPart sop = m_scene.GetSceneObjectPart(m_scene.RegionInfo.RegionSettings.TelehubObject); | 1304 | SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject); |
1305 | 1305 | if (sog != null) | |
1306 | OSDArray responsearr = new OSDArray(); | 1306 | { |
1307 | OSDMap responsemapdata = new OSDMap(); | 1307 | OSDArray responsearr = new OSDArray(); |
1308 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sop.AbsolutePosition.X)); | 1308 | OSDMap responsemapdata = new OSDMap(); |
1309 | responsemapdata["Y"] = OSD.FromInteger((int)(ystart + sop.AbsolutePosition.Y)); | 1309 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sog.AbsolutePosition.X)); |
1310 | responsemapdata["ID"] = OSD.FromUUID(sop.UUID); | 1310 | responsemapdata["Y"] = OSD.FromInteger((int)(ystart + sog.AbsolutePosition.Y)); |
1311 | responsemapdata["Name"] = OSD.FromString(sop.Name); | 1311 | // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y)); |
1312 | responsemapdata["Extra"] = OSD.FromInteger(0); // color (unused) | 1312 | responsemapdata["ID"] = OSD.FromUUID(sog.UUID); |
1313 | responsemapdata["Extra2"] = OSD.FromInteger(0); // 0 = telehub / 1 = infohub | 1313 | responsemapdata["Name"] = OSD.FromString(sog.Name); |
1314 | responsearr.Add(responsemapdata); | 1314 | responsemapdata["Extra"] = OSD.FromInteger(0); // color (unused) |
1315 | responsemapdata["Extra2"] = OSD.FromInteger(0); // 0 = telehub / 1 = infohub | ||
1316 | responsearr.Add(responsemapdata); | ||
1315 | 1317 | ||
1316 | responsemap["1"] = responsearr; | 1318 | responsemap["1"] = responsearr; |
1319 | } | ||
1317 | } | 1320 | } |
1318 | 1321 | ||
1319 | return responsemap; | 1322 | return responsemap; |