aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
diff options
context:
space:
mode:
authorMelanie2010-12-23 02:57:45 +0000
committerMelanie2010-12-23 02:57:45 +0000
commitd06456c8b2082e70dd94e40b4d5dab8bb95dd4c9 (patch)
tree6c2b079c8dc26b91d65169d378713e19c96387c5 /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
parentFix up some locking issues in task inventory. Don't use any prior versions in... (diff)
parentAdded a counter to NewFiles in Xfers to account for simultaneous object inven... (diff)
downloadopensim-SC_OLD-d06456c8b2082e70dd94e40b4d5dab8bb95dd4c9.zip
opensim-SC_OLD-d06456c8b2082e70dd94e40b4d5dab8bb95dd4c9.tar.gz
opensim-SC_OLD-d06456c8b2082e70dd94e40b4d5dab8bb95dd4c9.tar.bz2
opensim-SC_OLD-d06456c8b2082e70dd94e40b4d5dab8bb95dd4c9.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-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;