diff options
author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |
parent | Merge branch 'master' into httptests (diff) | |
parent | Massive tab and trailing space cleanup (diff) | |
download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz |
fix merge
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 81add13..f0de7d4 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -50,19 +50,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
50 | /// ; To use this module, you must specify the following in your OpenSim.ini | 50 | /// ; To use this module, you must specify the following in your OpenSim.ini |
51 | /// [GROUPS] | 51 | /// [GROUPS] |
52 | /// Enabled = true | 52 | /// Enabled = true |
53 | /// | 53 | /// |
54 | /// Module = GroupsModule | 54 | /// Module = GroupsModule |
55 | /// NoticesEnabled = true | 55 | /// NoticesEnabled = true |
56 | /// DebugEnabled = true | 56 | /// DebugEnabled = true |
57 | /// | 57 | /// |
58 | /// GroupsServicesConnectorModule = XmlRpcGroupsServicesConnector | 58 | /// GroupsServicesConnectorModule = XmlRpcGroupsServicesConnector |
59 | /// XmlRpcServiceURL = http://osflotsam.org/xmlrpc.php | 59 | /// XmlRpcServiceURL = http://osflotsam.org/xmlrpc.php |
60 | /// XmlRpcServiceReadKey = 1234 | 60 | /// XmlRpcServiceReadKey = 1234 |
61 | /// XmlRpcServiceWriteKey = 1234 | 61 | /// XmlRpcServiceWriteKey = 1234 |
62 | /// | 62 | /// |
63 | /// MessagingModule = GroupsMessagingModule | 63 | /// MessagingModule = GroupsMessagingModule |
64 | /// MessagingEnabled = true | 64 | /// MessagingEnabled = true |
65 | /// | 65 | /// |
66 | /// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for | 66 | /// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for |
67 | /// ; a problem discovered on some Windows based region servers. Only disable | 67 | /// ; a problem discovered on some Windows based region servers. Only disable |
68 | /// ; if you see a large number (dozens) of the following Exceptions: | 68 | /// ; if you see a large number (dozens) of the following Exceptions: |
@@ -332,7 +332,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
332 | remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups); | 332 | remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups); |
333 | } | 333 | } |
334 | 334 | ||
335 | 335 | ||
336 | private void OnClientClosed(UUID AgentId, Scene scene) | 336 | private void OnClientClosed(UUID AgentId, Scene scene) |
337 | { | 337 | { |
338 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 338 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
@@ -387,7 +387,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
387 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 387 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
388 | 388 | ||
389 | string GroupName; | 389 | string GroupName; |
390 | 390 | ||
391 | GroupRecord group = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null); | 391 | GroupRecord group = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null); |
392 | if (group != null) | 392 | if (group != null) |
393 | { | 393 | { |
@@ -403,9 +403,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
403 | 403 | ||
404 | private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im) | 404 | private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im) |
405 | { | 405 | { |
406 | if (m_debugEnabled) | 406 | if (m_debugEnabled) |
407 | m_log.DebugFormat( | 407 | m_log.DebugFormat( |
408 | "[GROUPS]: {0} called for {1}, message type {2}", | 408 | "[GROUPS]: {0} called for {1}, message type {2}", |
409 | System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name, (InstantMessageDialog)im.dialog); | 409 | System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name, (InstantMessageDialog)im.dialog); |
410 | 410 | ||
411 | // Group invitations | 411 | // Group invitations |
@@ -569,20 +569,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
569 | if (targetUser != null) | 569 | if (targetUser != null) |
570 | { | 570 | { |
571 | m_log.DebugFormat( | 571 | m_log.DebugFormat( |
572 | "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", | 572 | "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", |
573 | NoticeID, targetUser.FirstName + " " + targetUser.LastName, member.AcceptNotices); | 573 | NoticeID, targetUser.FirstName + " " + targetUser.LastName, member.AcceptNotices); |
574 | } | 574 | } |
575 | else | 575 | else |
576 | { | 576 | { |
577 | m_log.DebugFormat( | 577 | m_log.DebugFormat( |
578 | "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", | 578 | "[GROUPS]: Prepping group notice {0} for agent: {1} who Accepts Notices ({2})", |
579 | NoticeID, member.AgentID, member.AcceptNotices); | 579 | NoticeID, member.AgentID, member.AcceptNotices); |
580 | } | 580 | } |
581 | } | 581 | } |
582 | } | 582 | } |
583 | } | 583 | } |
584 | 584 | ||
585 | GridInstantMessage msg | 585 | GridInstantMessage msg |
586 | = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice); | 586 | = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice); |
587 | 587 | ||
588 | if (m_groupsMessagingModule != null) | 588 | if (m_groupsMessagingModule != null) |
@@ -599,7 +599,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
599 | 599 | ||
600 | UUID noticeID = new UUID(im.imSessionID); | 600 | UUID noticeID = new UUID(im.imSessionID); |
601 | 601 | ||
602 | if (m_debugEnabled) | 602 | if (m_debugEnabled) |
603 | m_log.DebugFormat("[GROUPS]: Requesting notice {0} for {1}", noticeID, remoteClient.AgentId); | 603 | m_log.DebugFormat("[GROUPS]: Requesting notice {0} for {1}", noticeID, remoteClient.AgentId); |
604 | 604 | ||
605 | GroupNoticeInfo notice = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), noticeID); | 605 | GroupNoticeInfo notice = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), noticeID); |
@@ -625,10 +625,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
625 | } | 625 | } |
626 | else | 626 | else |
627 | { | 627 | { |
628 | if (m_debugEnabled) | 628 | if (m_debugEnabled) |
629 | m_log.DebugFormat( | 629 | m_log.DebugFormat( |
630 | "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.", | 630 | "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.", |
631 | noticeID, remoteClient.AgentId); | 631 | noticeID, remoteClient.AgentId); |
632 | } | 632 | } |
633 | } | 633 | } |
634 | 634 | ||
@@ -698,7 +698,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
698 | { | 698 | { |
699 | return m_groupData.GetGroupRecord(UUID.Zero, UUID.Zero, name); | 699 | return m_groupData.GetGroupRecord(UUID.Zero, UUID.Zero, name); |
700 | } | 700 | } |
701 | 701 | ||
702 | public void ActivateGroup(IClientAPI remoteClient, UUID groupID) | 702 | public void ActivateGroup(IClientAPI remoteClient, UUID groupID) |
703 | { | 703 | { |
704 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 704 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
@@ -739,10 +739,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
739 | 739 | ||
740 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) | 740 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) |
741 | { | 741 | { |
742 | if (m_debugEnabled) | 742 | if (m_debugEnabled) |
743 | m_log.DebugFormat( | 743 | m_log.DebugFormat( |
744 | "[GROUPS]: GroupMembersRequest called for {0} from client {1}", groupID, remoteClient.Name); | 744 | "[GROUPS]: GroupMembersRequest called for {0} from client {1}", groupID, remoteClient.Name); |
745 | 745 | ||
746 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); | 746 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); |
747 | 747 | ||
748 | if (m_debugEnabled) | 748 | if (m_debugEnabled) |
@@ -829,7 +829,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
829 | 829 | ||
830 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) | 830 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) |
831 | { | 831 | { |
832 | if (m_debugEnabled) | 832 | if (m_debugEnabled) |
833 | m_log.DebugFormat( | 833 | m_log.DebugFormat( |
834 | "[GROUPS]: {0} called with groupID={1}, agentID={2}", | 834 | "[GROUPS]: {0} called with groupID={1}, agentID={2}", |
835 | System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); | 835 | System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); |
@@ -926,7 +926,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
926 | if (membership != null) | 926 | if (membership != null) |
927 | { | 927 | { |
928 | return membership.GroupTitle; | 928 | return membership.GroupTitle; |
929 | } | 929 | } |
930 | return string.Empty; | 930 | return string.Empty; |
931 | } | 931 | } |
932 | 932 | ||
@@ -999,7 +999,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
999 | case 1: | 999 | case 1: |
1000 | // Remove | 1000 | // Remove |
1001 | m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID); | 1001 | m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID); |
1002 | 1002 | ||
1003 | break; | 1003 | break; |
1004 | default: | 1004 | default: |
1005 | m_log.ErrorFormat("[GROUPS]: {0} does not understand changes == {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, changes); | 1005 | m_log.ErrorFormat("[GROUPS]: {0} does not understand changes == {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, changes); |
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1185 | 1185 | ||
1186 | // Send Message to Ejectee | 1186 | // Send Message to Ejectee |
1187 | GridInstantMessage msg = new GridInstantMessage(); | 1187 | GridInstantMessage msg = new GridInstantMessage(); |
1188 | 1188 | ||
1189 | string ejecteeName = "Unknown member"; | 1189 | string ejecteeName = "Unknown member"; |
1190 | // if local send a normal message | 1190 | // if local send a normal message |
1191 | if(ejecteeClient != null) | 1191 | if(ejecteeClient != null) |
@@ -1219,7 +1219,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1219 | msg.timestamp = 0; | 1219 | msg.timestamp = 0; |
1220 | msg.fromAgentName = agentName; | 1220 | msg.fromAgentName = agentName; |
1221 | msg.message = string.Format("You have been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName); | 1221 | msg.message = string.Format("You have been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName); |
1222 | // | 1222 | // |
1223 | msg.fromGroup = false; | 1223 | msg.fromGroup = false; |
1224 | msg.offline = (byte)0; | 1224 | msg.offline = (byte)0; |
1225 | msg.ParentEstateID = 0; | 1225 | msg.ParentEstateID = 0; |
@@ -1470,7 +1470,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1470 | membershipArray = membershipData.ToArray(); | 1470 | membershipArray = membershipData.ToArray(); |
1471 | } | 1471 | } |
1472 | } | 1472 | } |
1473 | 1473 | ||
1474 | if (m_debugEnabled) | 1474 | if (m_debugEnabled) |
1475 | { | 1475 | { |
1476 | m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); | 1476 | m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); |