aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-23 01:21:03 +0100
committerJustin Clark-Casey (justincc)2013-08-23 01:21:03 +0100
commit0fbfef964928300df3cf4144d39dff2490b6a4e4 (patch)
treeb4b87a834f7d930023d3157fcac416c259d6bf43 /OpenSim/Region
parentMake pCampbot "show bot" command take the bot number instead of the full bot ... (diff)
downloadopensim-SC_OLD-0fbfef964928300df3cf4144d39dff2490b6a4e4.zip
opensim-SC_OLD-0fbfef964928300df3cf4144d39dff2490b6a4e4.tar.gz
opensim-SC_OLD-0fbfef964928300df3cf4144d39dff2490b6a4e4.tar.bz2
opensim-SC_OLD-0fbfef964928300df3cf4144d39dff2490b6a4e4.tar.xz
minor: shortern warning messages in EntityTransferModule when UpdateAgent() fails
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs8
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 17ebc83..8950516 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -832,8 +832,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
832 } 832 }
833 833
834 m_log.WarnFormat( 834 m_log.WarnFormat(
835 "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}. Keeping avatar in source region.", 835 "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}. Keeping avatar in {2}",
836 sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName); 836 sp.Name, finalDestination.RegionName, sp.Scene.Name);
837 837
838 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established."); 838 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
839 return; 839 return;
@@ -1053,8 +1053,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1053 } 1053 }
1054 1054
1055 m_log.WarnFormat( 1055 m_log.WarnFormat(
1056 "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}. Keeping avatar in source region.", 1056 "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}. Keeping avatar in {2}",
1057 sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName); 1057 sp.Name, finalDestination.RegionName, sp.Scene.Name);
1058 1058
1059 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established."); 1059 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
1060 return; 1060 return;