diff options
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2fd6b52..02a0268 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3770,15 +3770,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
3770 | public void RequestTeleportLocation(IClientAPI remoteClient, string regionName, Vector3 position, | 3770 | public void RequestTeleportLocation(IClientAPI remoteClient, string regionName, Vector3 position, |
3771 | Vector3 lookat, uint teleportFlags) | 3771 | Vector3 lookat, uint teleportFlags) |
3772 | { | 3772 | { |
3773 | GridRegion regionInfo = GridService.GetRegionByName(UUID.Zero, regionName); | 3773 | List<GridRegion> regions = GridService.GetRegionsByName(RegionInfo.ScopeID, regionName, 1); |
3774 | if (regionInfo == null) | 3774 | if (regions == null || regions.Count == 0) |
3775 | { | 3775 | { |
3776 | // can't find the region: Tell viewer and abort | 3776 | // can't find the region: Tell viewer and abort |
3777 | remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found."); | 3777 | remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found."); |
3778 | return; | 3778 | return; |
3779 | } | 3779 | } |
3780 | 3780 | ||
3781 | RequestTeleportLocation(remoteClient, regionInfo.RegionHandle, position, lookat, teleportFlags); | 3781 | RequestTeleportLocation(remoteClient, regions[0].RegionHandle, position, lookat, teleportFlags); |
3782 | } | 3782 | } |
3783 | 3783 | ||
3784 | /// <summary> | 3784 | /// <summary> |