Check if remote simulator is up before attempting teleport. Teleport to a remote region should now fail gracefully if remote simulator is down.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 414c81e..f37ffc9 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -890,11 +890,11 @@ namespace OpenSim.Region.ClientStack
         /// <summary>
         /// 
         /// </summary>
-        public void SendTeleportFailed()
+        public void SendTeleportFailed(string reason)
         {
             TeleportFailedPacket tpFailed = (TeleportFailedPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFailed);
             tpFailed.Info.AgentID = AgentId;
-            tpFailed.Info.Reason = Helpers.StringToField("unknown failure of teleport");
+            tpFailed.Info.Reason = Helpers.StringToField(reason);
             OutPacket(tpFailed, ThrottleOutPacketType.Task);
         }