aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs1
2 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 491a971..18e97da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework;
38using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Framework.Scenes.Hypergrid;
41using OpenSim.Region.ScriptEngine.Shared; 42using OpenSim.Region.ScriptEngine.Shared;
42using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 43using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
43using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 44using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
@@ -506,6 +507,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
506 == World.LandChannel.GetLandObject( 507 == World.LandChannel.GetLandObject(
507 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).landData.OwnerID) 508 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).landData.OwnerID)
508 { 509 {
510
511 // Check for hostname , attempt to make a hglink
512 // and convert the regionName to the target region
513 if ( regionName.Contains(".") && regionName.Contains(":"))
514 {
515 // Try to link the region
516 RegionInfo regInfo = HGHyperlink.TryLinkRegion(World,
517 presence.ControllingClient,
518 regionName);
519 // Get the region name
520 if (regInfo != null)
521 {
522 regionName = regInfo.RegionName;
523 }
524 else
525 {
526 // Might need to ping the client here in case of failure??
527 }
528 }
509 presence.ControllingClient.SendTeleportLocationStart(); 529 presence.ControllingClient.SendTeleportLocationStart();
510 World.RequestTeleportLocation(presence.ControllingClient, regionName, 530 World.RequestTeleportLocation(presence.ControllingClient, regionName,
511 new Vector3((float)position.x, (float)position.y, (float)position.z), 531 new Vector3((float)position.x, (float)position.y, (float)position.z),
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 3884138..66691b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -707,6 +707,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
707 } 707 }
708 catch (Exception e) 708 catch (Exception e)
709 { 709 {
710 m_log.DebugFormat("[Script] Exception: {0}", e.Message);
710 m_InEvent = false; 711 m_InEvent = false;
711 m_CurrentEvent = String.Empty; 712 m_CurrentEvent = String.Empty;
712 713