diff options
author | Melanie | 2012-01-26 09:10:46 +0000 |
---|---|---|
committer | Melanie | 2012-01-26 09:10:46 +0000 |
commit | a537f7e1a30bece8302f69cd484b6b831c4b0ec7 (patch) | |
tree | e9826422fdd329423f5b2ee2022c5b705321e8e2 /OpenSim/Region/CoreModules/World/WorldMap | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Change references from sop to sog and add protection from null ref (diff) | |
download | opensim-SC_OLD-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.zip opensim-SC_OLD-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.tar.gz opensim-SC_OLD-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.tar.bz2 opensim-SC_OLD-a537f7e1a30bece8302f69cd484b6b831c4b0ec7.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 | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 021a669..3c1b3e0 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -489,18 +489,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
489 | List<mapItemReply> mapitems = new List<mapItemReply>(); | 489 | List<mapItemReply> mapitems = new List<mapItemReply>(); |
490 | mapItemReply mapitem = new mapItemReply(); | 490 | mapItemReply mapitem = new mapItemReply(); |
491 | 491 | ||
492 | SceneObjectPart sop = m_scene.GetSceneObjectPart(m_scene.RegionInfo.RegionSettings.TelehubObject); | 492 | SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject); |
493 | 493 | if (sog != null) | |
494 | mapitem = new mapItemReply(); | 494 | { |
495 | mapitem.x = (uint)(xstart + sop.AbsolutePosition.X); | 495 | mapitem = new mapItemReply(); |
496 | mapitem.y = (uint)(ystart + sop.AbsolutePosition.Y); | 496 | mapitem.x = (uint)(xstart + sog.AbsolutePosition.X); |
497 | mapitem.id = UUID.Zero; | 497 | mapitem.y = (uint)(ystart + sog.AbsolutePosition.Y); |
498 | mapitem.name = sop.Name; | 498 | mapitem.id = UUID.Zero; |
499 | mapitem.Extra = 0; // color (not used) | 499 | mapitem.name = sog.Name; |
500 | mapitem.Extra2 = 0; // 0 = telehub / 1 = infohub | 500 | mapitem.Extra = 0; // color (not used) |
501 | mapitems.Add(mapitem); | 501 | mapitem.Extra2 = 0; // 0 = telehub / 1 = infohub |
502 | mapitems.Add(mapitem); | ||
502 | 503 | ||
503 | remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags); | 504 | remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags); |
505 | } | ||
504 | } | 506 | } |
505 | else | 507 | else |
506 | { | 508 | { |