diff options
| author | Brian McBee | 2008-01-20 19:12:00 +0000 |
|---|---|---|
| committer | Brian McBee | 2008-01-20 19:12:00 +0000 |
| commit | 730e2d6d7c0e6ddc6448c4b6064498294134d67f (patch) | |
| tree | d26706e6361599b8cadc49eac59ba281fe459755 /OpenSim/Region/ClientStack | |
| parent | Tedds temp fix for startup crash: Waiting 3 seconds for stuff to catch up. (S... (diff) | |
| download | opensim-SC_OLD-730e2d6d7c0e6ddc6448c4b6064498294134d67f.zip opensim-SC_OLD-730e2d6d7c0e6ddc6448c4b6064498294134d67f.tar.gz opensim-SC_OLD-730e2d6d7c0e6ddc6448c4b6064498294134d67f.tar.bz2 opensim-SC_OLD-730e2d6d7c0e6ddc6448c4b6064498294134d67f.tar.xz | |
Check if remote simulator is up before attempting teleport. Teleport to a remote region should now fail gracefully if remote simulator is down.
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 4 |
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 | |||
| 890 | /// <summary> | 890 | /// <summary> |
| 891 | /// | 891 | /// |
| 892 | /// </summary> | 892 | /// </summary> |
| 893 | public void SendTeleportFailed() | 893 | public void SendTeleportFailed(string reason) |
| 894 | { | 894 | { |
| 895 | TeleportFailedPacket tpFailed = (TeleportFailedPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFailed); | 895 | TeleportFailedPacket tpFailed = (TeleportFailedPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFailed); |
| 896 | tpFailed.Info.AgentID = AgentId; | 896 | tpFailed.Info.AgentID = AgentId; |
| 897 | tpFailed.Info.Reason = Helpers.StringToField("unknown failure of teleport"); | 897 | tpFailed.Info.Reason = Helpers.StringToField(reason); |
| 898 | OutPacket(tpFailed, ThrottleOutPacketType.Task); | 898 | OutPacket(tpFailed, ThrottleOutPacketType.Task); |
| 899 | } | 899 | } |
| 900 | 900 | ||