aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons/Groups/GroupsModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Addons/Groups/GroupsModule.cs')
-rw-r--r--OpenSim/Addons/Groups/GroupsModule.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 57fbbf7..1e9f2b5 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Groups
51 private List<Scene> m_sceneList = new List<Scene>(); 51 private List<Scene> m_sceneList = new List<Scene>();
52 52
53 private IMessageTransferModule m_msgTransferModule = null; 53 private IMessageTransferModule m_msgTransferModule = null;
54 54
55 private IGroupsServicesConnector m_groupData = null; 55 private IGroupsServicesConnector m_groupData = null;
56 private IUserManagement m_UserManagement; 56 private IUserManagement m_UserManagement;
57 57
@@ -210,7 +210,7 @@ namespace OpenSim.Groups
210 if (m_debugEnabled) m_log.Debug("[Groups]: Shutting down Groups module."); 210 if (m_debugEnabled) m_log.Debug("[Groups]: Shutting down Groups module.");
211 } 211 }
212 212
213 public Type ReplaceableInterface 213 public Type ReplaceableInterface
214 { 214 {
215 get { return null; } 215 get { return null; }
216 } 216 }
@@ -318,7 +318,7 @@ namespace OpenSim.Groups
318 318
319 SendAgentGroupDataUpdate(remoteClient, false); 319 SendAgentGroupDataUpdate(remoteClient, false);
320 320
321 // also current viewers do ignore it and ask later on a much nicer thread 321 // also current viewers do ignore it and ask later on a much nicer thread
322 // its a info request not a change, so nothing is sent to others 322 // its a info request not a change, so nothing is sent to others
323 // they do get the group title with the avatar object update on arrivel to a region 323 // they do get the group title with the avatar object update on arrivel to a region
324 } 324 }
@@ -453,9 +453,9 @@ namespace OpenSim.Groups
453 } 453 }
454 454
455 if (m_groupData.AddGroupNotice(GetRequestingAgentIDStr(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, 455 if (m_groupData.AddGroupNotice(GetRequestingAgentIDStr(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message,
456 hasAttachment, 456 hasAttachment,
457 (byte)(item == null ? 0 : item.AssetType), 457 (byte)(item == null ? 0 : item.AssetType),
458 item == null ? null : item.Name, 458 item == null ? null : item.Name,
459 item == null ? UUID.Zero : item.ID, 459 item == null ? UUID.Zero : item.ID,
460 item == null ? UUID.Zero.ToString() : item.Owner.ToString())) 460 item == null ? UUID.Zero.ToString() : item.Owner.ToString()))
461 { 461 {
@@ -463,7 +463,7 @@ namespace OpenSim.Groups
463 { 463 {
464 OnNewGroupNotice(GroupID, NoticeID); 464 OnNewGroupNotice(GroupID, NoticeID);
465 } 465 }
466 466
467 // Send notice out to everyone that wants notices 467 // Send notice out to everyone that wants notices
468 foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID)) 468 foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID))
469 { 469 {
@@ -497,7 +497,7 @@ namespace OpenSim.Groups
497 497
498 m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId); 498 m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId);
499 string message; 499 string message;
500 InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId, 500 InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId,
501 giver, notice.noticeData.AttachmentItemID, out message); 501 giver, notice.noticeData.AttachmentItemID, out message);
502 502
503 if (itemCopy == null) 503 if (itemCopy == null)
@@ -509,10 +509,10 @@ namespace OpenSim.Groups
509 remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0); 509 remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
510 } 510 }
511 } 511 }
512 512
513 // Interop, received special 210 code for ejecting a group member 513 // Interop, received special 210 code for ejecting a group member
514 // this only works within the comms servers domain, and won't work hypergrid 514 // this only works within the comms servers domain, and won't work hypergrid
515 // TODO:FIXME: Use a presense server of some kind to find out where the 515 // TODO:FIXME: Use a presense server of some kind to find out where the
516 // client actually is, and try contacting that region directly to notify them, 516 // client actually is, and try contacting that region directly to notify them,
517 // or provide the notification via xmlrpc update queue 517 // or provide the notification via xmlrpc update queue
518 if ((im.dialog == 210)) 518 if ((im.dialog == 210))
@@ -523,7 +523,7 @@ namespace OpenSim.Groups
523 523
524 UUID ejecteeID = new UUID(im.toAgentID); 524 UUID ejecteeID = new UUID(im.toAgentID);
525 525
526 im.imSessionID = UUID.Zero.Guid; 526 im.imSessionID = UUID.Zero.Guid;
527 im.dialog = (byte)InstantMessageDialog.MessageFromAgent; 527 im.dialog = (byte)InstantMessageDialog.MessageFromAgent;
528 OutgoingInstantMessage(im, ejecteeID); 528 OutgoingInstantMessage(im, ejecteeID);
529 529
@@ -577,7 +577,7 @@ namespace OpenSim.Groups
577 { 577 {
578 return m_groupData.GetGroupRecord(UUID.Zero.ToString(), UUID.Zero, name); 578 return m_groupData.GetGroupRecord(UUID.Zero.ToString(), UUID.Zero, name);
579 } 579 }
580 580
581 public void ActivateGroup(IClientAPI remoteClient, UUID groupID) 581 public void ActivateGroup(IClientAPI remoteClient, UUID groupID)
582 { 582 {
583 if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 583 if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -585,7 +585,7 @@ namespace OpenSim.Groups
585 m_groupData.SetAgentActiveGroup(GetRequestingAgentIDStr(remoteClient), GetRequestingAgentIDStr(remoteClient), groupID); 585 m_groupData.SetAgentActiveGroup(GetRequestingAgentIDStr(remoteClient), GetRequestingAgentIDStr(remoteClient), groupID);
586 586
587 // Changing active group changes title, active powers, all kinds of things 587 // Changing active group changes title, active powers, all kinds of things
588 // anyone who is in any region that can see this client, should probably be 588 // anyone who is in any region that can see this client, should probably be
589 // updated with new group info. At a minimum, they should get ScenePresence 589 // updated with new group info. At a minimum, they should get ScenePresence
590 // updated with new title. 590 // updated with new title.
591 SendAgentGroupDataUpdate(remoteClient, true); 591 SendAgentGroupDataUpdate(remoteClient, true);
@@ -620,10 +620,10 @@ namespace OpenSim.Groups
620 620
621 public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) 621 public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID)
622 { 622 {
623 if (m_debugEnabled) 623 if (m_debugEnabled)
624 m_log.DebugFormat( 624 m_log.DebugFormat(
625 "[Groups]: GroupMembersRequest called for {0} from client {1}", groupID, remoteClient.Name); 625 "[Groups]: GroupMembersRequest called for {0} from client {1}", groupID, remoteClient.Name);
626 626
627 List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), groupID); 627 List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), groupID);
628 628
629 if (m_debugEnabled) 629 if (m_debugEnabled)
@@ -706,7 +706,7 @@ namespace OpenSim.Groups
706 706
707 public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) 707 public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID)
708 { 708 {
709 if (m_debugEnabled) 709 if (m_debugEnabled)
710 m_log.DebugFormat( 710 m_log.DebugFormat(
711 "[Groups]: {0} called with groupID={1}, agentID={2}", 711 "[Groups]: {0} called with groupID={1}, agentID={2}",
712 System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); 712 System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID);
@@ -776,7 +776,7 @@ namespace OpenSim.Groups
776 } 776 }
777 777
778 string reason = string.Empty; 778 string reason = string.Empty;
779 UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment, 779 UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment,
780 allowPublish, maturePublish, remoteClient.AgentId, out reason); 780 allowPublish, maturePublish, remoteClient.AgentId, out reason);
781 781
782 if (groupID != UUID.Zero) 782 if (groupID != UUID.Zero)
@@ -823,7 +823,7 @@ namespace OpenSim.Groups
823 if (membership != null) 823 if (membership != null)
824 { 824 {
825 return membership.GroupTitle; 825 return membership.GroupTitle;
826 } 826 }
827 return string.Empty; 827 return string.Empty;
828 } 828 }
829 829
@@ -839,7 +839,7 @@ namespace OpenSim.Groups
839 // TODO: Not sure what all is needed here, but if the active group role change is for the group 839 // TODO: Not sure what all is needed here, but if the active group role change is for the group
840 // the client currently has set active, then we need to do a scene presence update too 840 // the client currently has set active, then we need to do a scene presence update too
841 // if (m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient)).GroupID == GroupID) 841 // if (m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient)).GroupID == GroupID)
842 842
843 SendDataUpdate(remoteClient, true); 843 SendDataUpdate(remoteClient, true);
844 } 844 }
845 845
@@ -899,7 +899,7 @@ namespace OpenSim.Groups
899 case 1: 899 case 1:
900 // Remove 900 // Remove
901 m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentIDStr(remoteClient), memberID.ToString(), groupID, roleID); 901 m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentIDStr(remoteClient), memberID.ToString(), groupID, roleID);
902 902
903 break; 903 break;
904 default: 904 default:
905 m_log.ErrorFormat("[Groups]: {0} does not understand changes == {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, changes); 905 m_log.ErrorFormat("[Groups]: {0} does not understand changes == {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, changes);
@@ -1072,7 +1072,7 @@ namespace OpenSim.Groups
1072 1072
1073 // Send Message to Ejectee 1073 // Send Message to Ejectee
1074 GridInstantMessage msg = new GridInstantMessage(); 1074 GridInstantMessage msg = new GridInstantMessage();
1075 1075
1076 // if local send a normal message 1076 // if local send a normal message
1077 if(ejecteeClient != null) 1077 if(ejecteeClient != null)
1078 { 1078 {
@@ -1324,7 +1324,7 @@ namespace OpenSim.Groups
1324 membershipArray = membershipData.ToArray(); 1324 membershipArray = membershipData.ToArray();
1325 } 1325 }
1326 } 1326 }
1327 1327
1328 if (m_debugEnabled) 1328 if (m_debugEnabled)
1329 { 1329 {
1330 m_log.InfoFormat("[Groups]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); 1330 m_log.InfoFormat("[Groups]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId);