From af406748a23408ae3d99d67e034c7d8160db5d21 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 8 Apr 2014 09:37:52 +0300
Subject: Improved error messages when a teleport fails. The viewer's dialog
 already says "Teleport failed", so adding "Teleport refused" is redundant.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 7e1d68d..f7470bd 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -841,12 +841,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_interRegionTeleportFailures.Value++;
 
-                sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
-
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
                     sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
 
+                sp.ControllingClient.SendTeleportFailed(reason);
+
                 return;
             }
 
@@ -1090,12 +1090,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_interRegionTeleportFailures.Value++;
 
-                sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
-
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
                     sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
 
+                sp.ControllingClient.SendTeleportFailed(reason);
+
                 return;
             }
 
-- 
cgit v1.1