diff options
| author | Melanie | 2013-06-07 23:09:53 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-07 23:09:53 +0100 |
| commit | 45e333652c75bc3101ac7f757105b6f7ed5024a5 (patch) | |
| tree | e23ffd4f6ca0d20ef0501c683d9659c09c7c2d3e /OpenSim/Addons/Groups | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: add dr0berts to contributors list (diff) | |
| download | opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.zip opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.gz opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.bz2 opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Addons/Groups')
| -rw-r--r-- | OpenSim/Addons/Groups/GroupsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index f805d69..5b3b9f6 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
| @@ -347,7 +347,7 @@ namespace OpenSim.Groups | |||
| 347 | { | 347 | { |
| 348 | if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 348 | if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
| 349 | 349 | ||
| 350 | m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog); | 350 | //m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog); |
| 351 | // Group invitations | 351 | // Group invitations |
| 352 | if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) | 352 | if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) |
| 353 | { | 353 | { |