From 730e2d6d7c0e6ddc6448c4b6064498294134d67f Mon Sep 17 00:00:00 2001
From: Brian McBee
Date: Sun, 20 Jan 2008 19:12:00 +0000
Subject: Check if remote simulator is up before attempting teleport. Teleport
 to a remote region should now fail gracefully if remote simulator is down.

---
 OpenSim/Region/ClientStack/ClientView.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

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);
         }
 
-- 
cgit v1.1