diff options
| author | Justin Clark-Casey (justincc) | 2013-06-07 19:12:55 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-07 19:12:55 +0100 |
| commit | a74e65200ce70b9f2b7adee0c65d51cb6a48df41 (patch) | |
| tree | 06f20a3b2f1af101d9cad20cddeafa761a49e47b /OpenSim/Addons | |
| parent | In LocalFriendshipTerminated, send the original client's agentId to the frien... (diff) | |
| parent | Mantis #6620 (removed debug message) (diff) | |
| download | opensim-SC-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.zip opensim-SC-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.tar.gz opensim-SC-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.tar.bz2 opensim-SC-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Addons')
| -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 | { |