diff options
| author | Melanie | 2011-01-23 23:29:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-23 23:29:25 +0000 |
| commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
| tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
| parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
| parent | Fixes mantis #5343 (diff) | |
| download | opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 0d5401b..dd9819a 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 180 | } | 180 | } |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID); | 183 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID); |
| 184 | SendGridInstantMessageViaXMLRPC(im, result); | 184 | SendGridInstantMessageViaXMLRPC(im, result); |
| 185 | 185 | ||
| 186 | return; | 186 | return; |