aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMarck2011-01-21 20:00:04 +0100
committerMarck2011-02-17 13:47:13 +0100
commit4f9c3c73ad8cc2178e44c724c72a4bb292e5ea93 (patch)
treec75cf8ee0376322b61a0be5e9f8b5ed257dd47a2 /OpenSim/Region/Framework/Scenes
parentMake osTeleportOwner work in foreign regions by relaxing the restrictions on ... (diff)
downloadopensim-SC_OLD-4f9c3c73ad8cc2178e44c724c72a4bb292e5ea93.zip
opensim-SC_OLD-4f9c3c73ad8cc2178e44c724c72a4bb292e5ea93.tar.gz
opensim-SC_OLD-4f9c3c73ad8cc2178e44c724c72a4bb292e5ea93.tar.bz2
opensim-SC_OLD-4f9c3c73ad8cc2178e44c724c72a4bb292e5ea93.tar.xz
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
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>