diff options
author | Oren Hurvitz | 2014-04-08 09:37:52 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-08 08:11:30 +0100 |
commit | af406748a23408ae3d99d67e034c7d8160db5d21 (patch) | |
tree | 6caa3295d5eeaca164fa5bc9ce2836b704aaf6ce /OpenSim | |
parent | Allow invalidating the users cache (diff) | |
download | opensim-SC_OLD-af406748a23408ae3d99d67e034c7d8160db5d21.zip opensim-SC_OLD-af406748a23408ae3d99d67e034c7d8160db5d21.tar.gz opensim-SC_OLD-af406748a23408ae3d99d67e034c7d8160db5d21.tar.bz2 opensim-SC_OLD-af406748a23408ae3d99d67e034c7d8160db5d21.tar.xz |
Improved error messages when a teleport fails. The viewer's dialog already says "Teleport failed", so adding "Teleport refused" is redundant.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
841 | { | 841 | { |
842 | m_interRegionTeleportFailures.Value++; | 842 | m_interRegionTeleportFailures.Value++; |
843 | 843 | ||
844 | sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason)); | ||
845 | |||
846 | m_log.DebugFormat( | 844 | m_log.DebugFormat( |
847 | "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}", | 845 | "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}", |
848 | sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason); | 846 | sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason); |
849 | 847 | ||
848 | sp.ControllingClient.SendTeleportFailed(reason); | ||
849 | |||
850 | return; | 850 | return; |
851 | } | 851 | } |
852 | 852 | ||
@@ -1090,12 +1090,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1090 | { | 1090 | { |
1091 | m_interRegionTeleportFailures.Value++; | 1091 | m_interRegionTeleportFailures.Value++; |
1092 | 1092 | ||
1093 | sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason)); | ||
1094 | |||
1095 | m_log.DebugFormat( | 1093 | m_log.DebugFormat( |
1096 | "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}", | 1094 | "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}", |
1097 | sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason); | 1095 | sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason); |
1098 | 1096 | ||
1097 | sp.ControllingClient.SendTeleportFailed(reason); | ||
1098 | |||
1099 | return; | 1099 | return; |
1100 | } | 1100 | } |
1101 | 1101 | ||