aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorsacha2010-12-23 08:14:43 +0000
committersacha2010-12-23 08:14:43 +0000
commit98f0b4c72ad208e9f664d30bb6a84e0b2adf8214 (patch)
treefdf6001af7f458fed5bf6f18df9be1882eb193d4 /OpenSim/Region/CoreModules/Avatar
parentreactivating some traces to track a dead thread (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.zip
opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.gz
opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.bz2
opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 80adc46..a3e3b4e 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -620,8 +620,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
620 } 620 }
621 catch (WebException e) 621 catch (WebException e)
622 { 622 {
623 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0}} the host didn't respond ({2})", 623 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} the host didn't respond " + e.ToString(), reginfo.ServerURI.ToString());
624 reginfo.ServerURI, e.Message);
625 } 624 }
626 625
627 return false; 626 return false;