aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs16
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 712648d..3f0393d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -707,21 +707,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
707 == World.LandChannel.GetLandObject( 707 == World.LandChannel.GetLandObject(
708 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 708 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
709 { 709 {
710 // Check for hostname , attempt to make a hglink 710 // Check for hostname, attempt to make a HG link,
711 // and convert the regionName to the target region 711 // and convert the regionName to the target region
712 if (regionName.Contains(".") && regionName.Contains(":")) 712 if (regionName.Contains(".") && regionName.Contains(":"))
713 { 713 {
714 List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); 714 List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
715 // Try to link the region 715 string[] parts = regionName.Split(new char[] { ':' });
716 if (regions != null && regions.Count > 0) 716 if (parts.Length > 2)
717 { 717 regionName = parts[0] + ':' + parts[1] + "/ " + parts[2];
718 GridRegion regInfo = regions[0]; 718 regionName = "http://" + regionName;
719 string[] parts = regInfo.RegionName.Split(new char[] { ':' });
720 if (parts.Length > 2)
721 regionName = parts[2];
722 else
723 regionName = parts[0];
724 }
725 } 719 }
726 World.RequestTeleportLocation(presence.ControllingClient, regionName, 720 World.RequestTeleportLocation(presence.ControllingClient, regionName,
727 new Vector3((float)position.x, (float)position.y, (float)position.z), 721 new Vector3((float)position.x, (float)position.y, (float)position.z),