diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 2f723ef..af9c650 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1252,20 +1252,22 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1252 | 1252 | ||
1253 | if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) | 1253 | if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) |
1254 | { | 1254 | { |
1255 | SceneObjectPart sop = m_scene.GetSceneObjectPart(m_scene.RegionInfo.RegionSettings.TelehubObject); | 1255 | SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject); |
1256 | 1256 | if (sog != null) | |
1257 | OSDArray responsearr = new OSDArray(); | 1257 | { |
1258 | OSDMap responsemapdata = new OSDMap(); | 1258 | OSDArray responsearr = new OSDArray(); |
1259 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sop.AbsolutePosition.X)); | 1259 | OSDMap responsemapdata = new OSDMap(); |
1260 | responsemapdata["Y"] = OSD.FromInteger((int)(ystart + sop.AbsolutePosition.Y)); | 1260 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sog.AbsolutePosition.X)); |
1261 | // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y)); | 1261 | responsemapdata["Y"] = OSD.FromInteger((int)(ystart + sog.AbsolutePosition.Y)); |
1262 | responsemapdata["ID"] = OSD.FromUUID(sop.UUID); | 1262 | // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y)); |
1263 | responsemapdata["Name"] = OSD.FromString(sop.Name); | 1263 | responsemapdata["ID"] = OSD.FromUUID(sog.UUID); |
1264 | responsemapdata["Extra"] = OSD.FromInteger(0); // color (unused) | 1264 | responsemapdata["Name"] = OSD.FromString(sog.Name); |
1265 | responsemapdata["Extra2"] = OSD.FromInteger(0); // 0 = telehub / 1 = infohub | 1265 | responsemapdata["Extra"] = OSD.FromInteger(0); // color (unused) |
1266 | responsearr.Add(responsemapdata); | 1266 | responsemapdata["Extra2"] = OSD.FromInteger(0); // 0 = telehub / 1 = infohub |
1267 | responsearr.Add(responsemapdata); | ||
1267 | 1268 | ||
1268 | responsemap["1"] = responsearr; | 1269 | responsemap["1"] = responsearr; |
1270 | } | ||
1269 | } | 1271 | } |
1270 | 1272 | ||
1271 | return responsemap; | 1273 | return responsemap; |