diff options
back port groups changes
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 299 |
1 files changed, 118 insertions, 181 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 8d32e66..edd5af7 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -87,16 +87,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
87 | 87 | ||
88 | private IGroupsServicesConnector m_groupData = null; | 88 | private IGroupsServicesConnector m_groupData = null; |
89 | 89 | ||
90 | class GroupRequestIDInfo | ||
91 | { | ||
92 | public GroupRequestID RequestID = new GroupRequestID(); | ||
93 | public DateTime LastUsedTMStamp = DateTime.MinValue; | ||
94 | } | ||
95 | private Dictionary<UUID, GroupRequestIDInfo> m_clientRequestIDInfo = new Dictionary<UUID, GroupRequestIDInfo>(); | ||
96 | private const int m_clientRequestIDFlushTimeOut = 300000; // Every 5 minutes | ||
97 | private Timer m_clientRequestIDFlushTimer; | ||
98 | |||
99 | |||
100 | // Configuration settings | 90 | // Configuration settings |
101 | private bool m_groupsEnabled = false; | 91 | private bool m_groupsEnabled = false; |
102 | private bool m_groupNoticesEnabled = true; | 92 | private bool m_groupNoticesEnabled = true; |
@@ -133,30 +123,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
133 | m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true); | 123 | m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true); |
134 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); | 124 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); |
135 | 125 | ||
136 | m_clientRequestIDFlushTimer = new Timer(); | ||
137 | m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut; | ||
138 | m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache; | ||
139 | m_clientRequestIDFlushTimer.AutoReset = true; | ||
140 | m_clientRequestIDFlushTimer.Start(); | ||
141 | } | ||
142 | } | ||
143 | |||
144 | void FlushClientRequestIDInfoCache(object sender, ElapsedEventArgs e) | ||
145 | { | ||
146 | lock (m_clientRequestIDInfo) | ||
147 | { | ||
148 | TimeSpan cacheTimeout = new TimeSpan(0,0, m_clientRequestIDFlushTimeOut / 1000); | ||
149 | UUID[] CurrentKeys = new UUID[m_clientRequestIDInfo.Count]; | ||
150 | foreach (UUID key in CurrentKeys) | ||
151 | { | ||
152 | if (m_clientRequestIDInfo.ContainsKey(key)) | ||
153 | { | ||
154 | if (DateTime.Now - m_clientRequestIDInfo[key].LastUsedTMStamp > cacheTimeout) | ||
155 | { | ||
156 | m_clientRequestIDInfo.Remove(key); | ||
157 | } | ||
158 | } | ||
159 | } | ||
160 | } | 126 | } |
161 | } | 127 | } |
162 | 128 | ||
@@ -234,8 +200,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
234 | return; | 200 | return; |
235 | 201 | ||
236 | if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module."); | 202 | if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module."); |
237 | |||
238 | m_clientRequestIDFlushTimer.Stop(); | ||
239 | } | 203 | } |
240 | 204 | ||
241 | public Type ReplaceableInterface | 205 | public Type ReplaceableInterface |
@@ -272,14 +236,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
272 | // Used for Notices and Group Invites/Accept/Reject | 236 | // Used for Notices and Group Invites/Accept/Reject |
273 | client.OnInstantMessage += OnInstantMessage; | 237 | client.OnInstantMessage += OnInstantMessage; |
274 | 238 | ||
275 | lock (m_clientRequestIDInfo) | 239 | // Send client thier groups information. |
276 | { | ||
277 | if (m_clientRequestIDInfo.ContainsKey(client.AgentId)) | ||
278 | { | ||
279 | // flush any old RequestID information | ||
280 | m_clientRequestIDInfo.Remove(client.AgentId); | ||
281 | } | ||
282 | } | ||
283 | SendAgentGroupDataUpdate(client, client.AgentId); | 240 | SendAgentGroupDataUpdate(client, client.AgentId); |
284 | } | 241 | } |
285 | 242 | ||
@@ -287,7 +244,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
287 | { | 244 | { |
288 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 245 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
289 | 246 | ||
290 | //GroupMembershipData[] avatarGroups = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), avatarID).ToArray(); | 247 | //GroupMembershipData[] avatarGroups = m_groupData.GetAgentGroupMemberships(GetRequestingAgentID(remoteClient), avatarID).ToArray(); |
291 | GroupMembershipData[] avatarGroups = GetProfileListedGroupMemberships(remoteClient, avatarID); | 248 | GroupMembershipData[] avatarGroups = GetProfileListedGroupMemberships(remoteClient, avatarID); |
292 | remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups); | 249 | remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups); |
293 | } | 250 | } |
@@ -331,10 +288,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
331 | { | 288 | { |
332 | if (((DirFindFlags)queryFlags & DirFindFlags.Groups) == DirFindFlags.Groups) | 289 | if (((DirFindFlags)queryFlags & DirFindFlags.Groups) == DirFindFlags.Groups) |
333 | { | 290 | { |
334 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart); | 291 | if (m_debugEnabled) |
292 | m_log.DebugFormat( | ||
293 | "[GROUPS]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", | ||
294 | System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart); | ||
335 | 295 | ||
336 | // TODO: This currently ignores pretty much all the query flags including Mature and sort order | 296 | // TODO: This currently ignores pretty much all the query flags including Mature and sort order |
337 | remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetClientGroupRequestID(remoteClient), queryText).ToArray()); | 297 | remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetRequestingAgentID(remoteClient), queryText).ToArray()); |
338 | } | 298 | } |
339 | 299 | ||
340 | } | 300 | } |
@@ -348,7 +308,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
348 | string activeGroupName = string.Empty; | 308 | string activeGroupName = string.Empty; |
349 | ulong activeGroupPowers = (ulong)GroupPowers.None; | 309 | ulong activeGroupPowers = (ulong)GroupPowers.None; |
350 | 310 | ||
351 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(GetClientGroupRequestID(remoteClient), dataForAgentID); | 311 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient), dataForAgentID); |
352 | if (membership != null) | 312 | if (membership != null) |
353 | { | 313 | { |
354 | activeGroupID = membership.GroupID; | 314 | activeGroupID = membership.GroupID; |
@@ -361,13 +321,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
361 | SendScenePresenceUpdate(dataForAgentID, activeGroupTitle); | 321 | SendScenePresenceUpdate(dataForAgentID, activeGroupTitle); |
362 | } | 322 | } |
363 | 323 | ||
364 | private void HandleUUIDGroupNameRequest(UUID GroupID,IClientAPI remoteClient) | 324 | private void HandleUUIDGroupNameRequest(UUID GroupID, IClientAPI remoteClient) |
365 | { | 325 | { |
366 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 326 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
367 | 327 | ||
368 | string GroupName; | 328 | string GroupName; |
369 | 329 | ||
370 | GroupRecord group = m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), GroupID, null); | 330 | GroupRecord group = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null); |
371 | if (group != null) | 331 | if (group != null) |
372 | { | 332 | { |
373 | GroupName = group.GroupName; | 333 | GroupName = group.GroupName; |
@@ -388,7 +348,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
388 | if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) | 348 | if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) |
389 | { | 349 | { |
390 | UUID inviteID = new UUID(im.imSessionID); | 350 | UUID inviteID = new UUID(im.imSessionID); |
391 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID); | 351 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID); |
392 | 352 | ||
393 | if (inviteInfo == null) | 353 | if (inviteInfo == null) |
394 | { | 354 | { |
@@ -407,7 +367,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
407 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received an accept invite notice."); | 367 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received an accept invite notice."); |
408 | 368 | ||
409 | // and the sessionid is the role | 369 | // and the sessionid is the role |
410 | m_groupData.AddAgentToGroup(GetClientGroupRequestID(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID, inviteInfo.RoleID); | 370 | m_groupData.AddAgentToGroup(GetRequestingAgentID(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID, inviteInfo.RoleID); |
411 | 371 | ||
412 | GridInstantMessage msg = new GridInstantMessage(); | 372 | GridInstantMessage msg = new GridInstantMessage(); |
413 | msg.imSessionID = UUID.Zero.Guid; | 373 | msg.imSessionID = UUID.Zero.Guid; |
@@ -431,14 +391,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
431 | // TODO: If the inviter is still online, they need an agent dataupdate | 391 | // TODO: If the inviter is still online, they need an agent dataupdate |
432 | // and maybe group membership updates for the invitee | 392 | // and maybe group membership updates for the invitee |
433 | 393 | ||
434 | m_groupData.RemoveAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID); | 394 | m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID); |
435 | } | 395 | } |
436 | 396 | ||
437 | // Reject | 397 | // Reject |
438 | if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline) | 398 | if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline) |
439 | { | 399 | { |
440 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received a reject invite notice."); | 400 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received a reject invite notice."); |
441 | m_groupData.RemoveAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID); | 401 | m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID); |
442 | } | 402 | } |
443 | } | 403 | } |
444 | } | 404 | } |
@@ -452,7 +412,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
452 | } | 412 | } |
453 | 413 | ||
454 | UUID GroupID = new UUID(im.toAgentID); | 414 | UUID GroupID = new UUID(im.toAgentID); |
455 | if (m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), GroupID, null) != null) | 415 | if (m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null) != null) |
456 | { | 416 | { |
457 | UUID NoticeID = UUID.Random(); | 417 | UUID NoticeID = UUID.Random(); |
458 | string Subject = im.message.Substring(0, im.message.IndexOf('|')); | 418 | string Subject = im.message.Substring(0, im.message.IndexOf('|')); |
@@ -496,14 +456,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
496 | } | 456 | } |
497 | 457 | ||
498 | 458 | ||
499 | m_groupData.AddGroupNotice(GetClientGroupRequestID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket); | 459 | m_groupData.AddGroupNotice(GetRequestingAgentID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket); |
500 | if (OnNewGroupNotice != null) | 460 | if (OnNewGroupNotice != null) |
501 | { | 461 | { |
502 | OnNewGroupNotice(GroupID, NoticeID); | 462 | OnNewGroupNotice(GroupID, NoticeID); |
503 | } | 463 | } |
504 | 464 | ||
505 | // Send notice out to everyone that wants notices | 465 | // Send notice out to everyone that wants notices |
506 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetClientGroupRequestID(remoteClient), GroupID)) | 466 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), GroupID)) |
507 | { | 467 | { |
508 | if (m_debugEnabled) | 468 | if (m_debugEnabled) |
509 | { | 469 | { |
@@ -549,7 +509,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
549 | IClientAPI ejectee = GetActiveClient(ejecteeID); | 509 | IClientAPI ejectee = GetActiveClient(ejecteeID); |
550 | if (ejectee != null) | 510 | if (ejectee != null) |
551 | { | 511 | { |
552 | UUID groupID = new UUID(im.fromAgentID); | 512 | UUID groupID = new UUID(im.imSessionID); |
553 | ejectee.SendAgentDropGroup(groupID); | 513 | ejectee.SendAgentDropGroup(groupID); |
554 | } | 514 | } |
555 | } | 515 | } |
@@ -588,20 +548,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
588 | 548 | ||
589 | public GroupRecord GetGroupRecord(UUID GroupID) | 549 | public GroupRecord GetGroupRecord(UUID GroupID) |
590 | { | 550 | { |
591 | return m_groupData.GetGroupRecord(null, GroupID, null); | 551 | return m_groupData.GetGroupRecord(UUID.Zero, GroupID, null); |
592 | } | 552 | } |
593 | 553 | ||
554 | public GroupRecord GetGroupRecord(string name) | ||
555 | { | ||
556 | return m_groupData.GetGroupRecord(UUID.Zero, UUID.Zero, name); | ||
557 | } | ||
558 | |||
594 | public void ActivateGroup(IClientAPI remoteClient, UUID groupID) | 559 | public void ActivateGroup(IClientAPI remoteClient, UUID groupID) |
595 | { | 560 | { |
596 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 561 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
597 | 562 | ||
598 | m_groupData.SetAgentActiveGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID); | 563 | m_groupData.SetAgentActiveGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
599 | 564 | ||
600 | // Changing active group changes title, active powers, all kinds of things | 565 | // Changing active group changes title, active powers, all kinds of things |
601 | // anyone who is in any region that can see this client, should probably be | 566 | // anyone who is in any region that can see this client, should probably be |
602 | // updated with new group info. At a minimum, they should get ScenePresence | 567 | // updated with new group info. At a minimum, they should get ScenePresence |
603 | // updated with new title. | 568 | // updated with new title. |
604 | UpdateAllClientsWithGroupInfo(remoteClient.AgentId); | 569 | UpdateAllClientsWithGroupInfo(GetRequestingAgentID(remoteClient)); |
605 | } | 570 | } |
606 | 571 | ||
607 | /// <summary> | 572 | /// <summary> |
@@ -611,10 +576,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
611 | { | 576 | { |
612 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 577 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
613 | 578 | ||
614 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
615 | 579 | ||
616 | List<GroupRolesData> agentRoles = m_groupData.GetAgentGroupRoles(grID, remoteClient.AgentId, groupID); | 580 | List<GroupRolesData> agentRoles = m_groupData.GetAgentGroupRoles(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
617 | GroupMembershipData agentMembership = m_groupData.GetAgentGroupMembership(grID, remoteClient.AgentId, groupID); | 581 | GroupMembershipData agentMembership = m_groupData.GetAgentGroupMembership(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
618 | 582 | ||
619 | List<GroupTitlesData> titles = new List<GroupTitlesData>(); | 583 | List<GroupTitlesData> titles = new List<GroupTitlesData>(); |
620 | foreach (GroupRolesData role in agentRoles) | 584 | foreach (GroupRolesData role in agentRoles) |
@@ -636,8 +600,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
636 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) | 600 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) |
637 | { | 601 | { |
638 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 602 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
603 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); | ||
639 | 604 | ||
640 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetClientGroupRequestID(remoteClient), groupID); | 605 | if (m_debugEnabled) |
606 | { | ||
607 | foreach (GroupMembersData member in data) | ||
608 | { | ||
609 | m_log.DebugFormat("[GROUPS]: Member({0}) - IsOwner({1})", member.AgentID, member.IsOwner); | ||
610 | } | ||
611 | } | ||
641 | 612 | ||
642 | return data; | 613 | return data; |
643 | 614 | ||
@@ -647,21 +618,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
647 | { | 618 | { |
648 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 619 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
649 | 620 | ||
650 | List<GroupRolesData> data = m_groupData.GetGroupRoles(GetClientGroupRequestID(remoteClient), groupID); | 621 | List<GroupRolesData> data = m_groupData.GetGroupRoles(GetRequestingAgentID(remoteClient), groupID); |
651 | 622 | ||
652 | return data; | 623 | return data; |
653 | |||
654 | } | 624 | } |
655 | 625 | ||
656 | public List<GroupRoleMembersData> GroupRoleMembersRequest(IClientAPI remoteClient, UUID groupID) | 626 | public List<GroupRoleMembersData> GroupRoleMembersRequest(IClientAPI remoteClient, UUID groupID) |
657 | { | 627 | { |
658 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 628 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
659 | 629 | ||
660 | List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetClientGroupRequestID(remoteClient), groupID); | 630 | List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetRequestingAgentID(remoteClient), groupID); |
661 | 631 | ||
632 | if (m_debugEnabled) | ||
633 | { | ||
634 | foreach (GroupRoleMembersData member in data) | ||
635 | { | ||
636 | m_log.DebugFormat("[GROUPS]: Member({0}) - Role({1})", member.MemberID, member.RoleID); | ||
637 | } | ||
638 | } | ||
662 | return data; | 639 | return data; |
663 | |||
664 | |||
665 | } | 640 | } |
666 | 641 | ||
667 | public GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID) | 642 | public GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID) |
@@ -670,17 +645,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
670 | 645 | ||
671 | GroupProfileData profile = new GroupProfileData(); | 646 | GroupProfileData profile = new GroupProfileData(); |
672 | 647 | ||
673 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
674 | 648 | ||
675 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), groupID, null); | 649 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), groupID, null); |
676 | if (groupInfo != null) | 650 | if (groupInfo != null) |
677 | { | 651 | { |
678 | profile.AllowPublish = groupInfo.AllowPublish; | 652 | profile.AllowPublish = groupInfo.AllowPublish; |
679 | profile.Charter = groupInfo.Charter; | 653 | profile.Charter = groupInfo.Charter; |
680 | profile.FounderID = groupInfo.FounderID; | 654 | profile.FounderID = groupInfo.FounderID; |
681 | profile.GroupID = groupID; | 655 | profile.GroupID = groupID; |
682 | profile.GroupMembershipCount = m_groupData.GetGroupMembers(grID, groupID).Count; | 656 | profile.GroupMembershipCount = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID).Count; |
683 | profile.GroupRolesCount = m_groupData.GetGroupRoles(grID, groupID).Count; | 657 | profile.GroupRolesCount = m_groupData.GetGroupRoles(GetRequestingAgentID(remoteClient), groupID).Count; |
684 | profile.InsigniaID = groupInfo.GroupPicture; | 658 | profile.InsigniaID = groupInfo.GroupPicture; |
685 | profile.MaturePublish = groupInfo.MaturePublish; | 659 | profile.MaturePublish = groupInfo.MaturePublish; |
686 | profile.MembershipFee = groupInfo.MembershipFee; | 660 | profile.MembershipFee = groupInfo.MembershipFee; |
@@ -691,7 +665,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
691 | profile.ShowInList = groupInfo.ShowInList; | 665 | profile.ShowInList = groupInfo.ShowInList; |
692 | } | 666 | } |
693 | 667 | ||
694 | GroupMembershipData memberInfo = m_groupData.GetAgentGroupMembership(grID, remoteClient.AgentId, groupID); | 668 | GroupMembershipData memberInfo = m_groupData.GetAgentGroupMembership(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
695 | if (memberInfo != null) | 669 | if (memberInfo != null) |
696 | { | 670 | { |
697 | profile.MemberTitle = memberInfo.GroupTitle; | 671 | profile.MemberTitle = memberInfo.GroupTitle; |
@@ -705,40 +679,40 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
705 | { | 679 | { |
706 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 680 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
707 | 681 | ||
708 | return m_groupData.GetAgentGroupMemberships(null, agentID).ToArray(); | 682 | return m_groupData.GetAgentGroupMemberships(UUID.Zero, agentID).ToArray(); |
709 | } | 683 | } |
710 | 684 | ||
711 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) | 685 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) |
712 | { | 686 | { |
713 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 687 | if (m_debugEnabled) |
688 | m_log.DebugFormat( | ||
689 | "[GROUPS]: {0} called with groupID={1}, agentID={2}", | ||
690 | System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); | ||
714 | 691 | ||
715 | return m_groupData.GetAgentGroupMembership(null, agentID, groupID); | 692 | return m_groupData.GetAgentGroupMembership(UUID.Zero, agentID, groupID); |
716 | } | 693 | } |
717 | 694 | ||
718 | public void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) | 695 | public void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) |
719 | { | 696 | { |
720 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 697 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
721 | 698 | ||
722 | // TODO: Security Check? | 699 | // Note: Permissions checking for modification rights is handled by the Groups Server/Service |
723 | 700 | m_groupData.UpdateGroup(GetRequestingAgentID(remoteClient), groupID, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish); | |
724 | m_groupData.UpdateGroup(GetClientGroupRequestID(remoteClient), groupID, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish); | ||
725 | } | 701 | } |
726 | 702 | ||
727 | public void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile) | 703 | public void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile) |
728 | { | 704 | { |
729 | // TODO: Security Check? | 705 | // Note: Permissions checking for modification rights is handled by the Groups Server/Service |
730 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 706 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
731 | 707 | ||
732 | m_groupData.SetAgentGroupInfo(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, acceptNotices, listInProfile); | 708 | m_groupData.SetAgentGroupInfo(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, acceptNotices, listInProfile); |
733 | } | 709 | } |
734 | 710 | ||
735 | public UUID CreateGroup(IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) | 711 | public UUID CreateGroup(IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) |
736 | { | 712 | { |
737 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 713 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
738 | 714 | ||
739 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | 715 | if (m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), UUID.Zero, name) != null) |
740 | |||
741 | if (m_groupData.GetGroupRecord(grID, UUID.Zero, name) != null) | ||
742 | { | 716 | { |
743 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); | 717 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); |
744 | return UUID.Zero; | 718 | return UUID.Zero; |
@@ -754,12 +728,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
754 | } | 728 | } |
755 | money.ApplyGroupCreationCharge(remoteClient.AgentId); | 729 | money.ApplyGroupCreationCharge(remoteClient.AgentId); |
756 | } | 730 | } |
757 | UUID groupID = m_groupData.CreateGroup(grID, name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, remoteClient.AgentId); | 731 | UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient)); |
758 | 732 | ||
759 | remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); | 733 | remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); |
760 | 734 | ||
761 | // Update the founder with new group information. | 735 | // Update the founder with new group information. |
762 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 736 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
763 | 737 | ||
764 | return groupID; | 738 | return groupID; |
765 | } | 739 | } |
@@ -770,7 +744,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
770 | 744 | ||
771 | // ToDo: check if agent is a member of group and is allowed to see notices? | 745 | // ToDo: check if agent is a member of group and is allowed to see notices? |
772 | 746 | ||
773 | return m_groupData.GetGroupNotices(GetClientGroupRequestID(remoteClient), groupID).ToArray(); | 747 | return m_groupData.GetGroupNotices(GetRequestingAgentID(remoteClient), groupID).ToArray(); |
774 | } | 748 | } |
775 | 749 | ||
776 | /// <summary> | 750 | /// <summary> |
@@ -780,7 +754,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
780 | { | 754 | { |
781 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 755 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
782 | 756 | ||
783 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(null, avatarID); | 757 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(UUID.Zero, avatarID); |
784 | if (membership != null) | 758 | if (membership != null) |
785 | { | 759 | { |
786 | return membership.GroupTitle; | 760 | return membership.GroupTitle; |
@@ -795,13 +769,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
795 | { | 769 | { |
796 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 770 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
797 | 771 | ||
798 | m_groupData.SetAgentActiveGroupRole(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, titleRoleID); | 772 | m_groupData.SetAgentActiveGroupRole(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, titleRoleID); |
799 | 773 | ||
800 | // TODO: Not sure what all is needed here, but if the active group role change is for the group | 774 | // TODO: Not sure what all is needed here, but if the active group role change is for the group |
801 | // the client currently has set active, then we need to do a scene presence update too | 775 | // the client currently has set active, then we need to do a scene presence update too |
802 | // if (m_groupData.GetAgentActiveMembership(remoteClient.AgentId).GroupID == GroupID) | 776 | // if (m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient)).GroupID == GroupID) |
803 | 777 | ||
804 | UpdateAllClientsWithGroupInfo(remoteClient.AgentId); | 778 | UpdateAllClientsWithGroupInfo(GetRequestingAgentID(remoteClient)); |
805 | } | 779 | } |
806 | 780 | ||
807 | 781 | ||
@@ -811,16 +785,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
811 | 785 | ||
812 | // Security Checks are handled in the Groups Service. | 786 | // Security Checks are handled in the Groups Service. |
813 | 787 | ||
814 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
815 | |||
816 | switch ((OpenMetaverse.GroupRoleUpdate)updateType) | 788 | switch ((OpenMetaverse.GroupRoleUpdate)updateType) |
817 | { | 789 | { |
818 | case OpenMetaverse.GroupRoleUpdate.Create: | 790 | case OpenMetaverse.GroupRoleUpdate.Create: |
819 | m_groupData.AddGroupRole(grID, groupID, UUID.Random(), name, description, title, powers); | 791 | m_groupData.AddGroupRole(GetRequestingAgentID(remoteClient), groupID, UUID.Random(), name, description, title, powers); |
820 | break; | 792 | break; |
821 | 793 | ||
822 | case OpenMetaverse.GroupRoleUpdate.Delete: | 794 | case OpenMetaverse.GroupRoleUpdate.Delete: |
823 | m_groupData.RemoveGroupRole(grID, groupID, roleID); | 795 | m_groupData.RemoveGroupRole(GetRequestingAgentID(remoteClient), groupID, roleID); |
824 | break; | 796 | break; |
825 | 797 | ||
826 | case OpenMetaverse.GroupRoleUpdate.UpdateAll: | 798 | case OpenMetaverse.GroupRoleUpdate.UpdateAll: |
@@ -831,7 +803,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
831 | GroupPowers gp = (GroupPowers)powers; | 803 | GroupPowers gp = (GroupPowers)powers; |
832 | m_log.DebugFormat("[GROUPS]: Role ({0}) updated with Powers ({1}) ({2})", name, powers.ToString(), gp.ToString()); | 804 | m_log.DebugFormat("[GROUPS]: Role ({0}) updated with Powers ({1}) ({2})", name, powers.ToString(), gp.ToString()); |
833 | } | 805 | } |
834 | m_groupData.UpdateGroupRole(grID, groupID, roleID, name, description, title, powers); | 806 | m_groupData.UpdateGroupRole(GetRequestingAgentID(remoteClient), groupID, roleID, name, description, title, powers); |
835 | break; | 807 | break; |
836 | 808 | ||
837 | case OpenMetaverse.GroupRoleUpdate.NoUpdate: | 809 | case OpenMetaverse.GroupRoleUpdate.NoUpdate: |
@@ -842,7 +814,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
842 | } | 814 | } |
843 | 815 | ||
844 | // TODO: This update really should send out updates for everyone in the role that just got changed. | 816 | // TODO: This update really should send out updates for everyone in the role that just got changed. |
845 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 817 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
846 | } | 818 | } |
847 | 819 | ||
848 | public void GroupRoleChanges(IClientAPI remoteClient, UUID groupID, UUID roleID, UUID memberID, uint changes) | 820 | public void GroupRoleChanges(IClientAPI remoteClient, UUID groupID, UUID roleID, UUID memberID, uint changes) |
@@ -850,18 +822,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
850 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 822 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
851 | // Todo: Security check | 823 | // Todo: Security check |
852 | 824 | ||
853 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
854 | |||
855 | switch (changes) | 825 | switch (changes) |
856 | { | 826 | { |
857 | case 0: | 827 | case 0: |
858 | // Add | 828 | // Add |
859 | m_groupData.AddAgentToGroupRole(grID, memberID, groupID, roleID); | 829 | m_groupData.AddAgentToGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID); |
860 | 830 | ||
861 | break; | 831 | break; |
862 | case 1: | 832 | case 1: |
863 | // Remove | 833 | // Remove |
864 | m_groupData.RemoveAgentFromGroupRole(grID, memberID, groupID, roleID); | 834 | m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID); |
865 | 835 | ||
866 | break; | 836 | break; |
867 | default: | 837 | default: |
@@ -870,25 +840,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
870 | } | 840 | } |
871 | 841 | ||
872 | // TODO: This update really should send out updates for everyone in the role that just got changed. | 842 | // TODO: This update really should send out updates for everyone in the role that just got changed. |
873 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 843 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
874 | } | 844 | } |
875 | 845 | ||
876 | public void GroupNoticeRequest(IClientAPI remoteClient, UUID groupNoticeID) | 846 | public void GroupNoticeRequest(IClientAPI remoteClient, UUID groupNoticeID) |
877 | { | 847 | { |
878 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 848 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
879 | 849 | ||
880 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | 850 | GroupNoticeInfo data = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), groupNoticeID); |
881 | |||
882 | GroupNoticeInfo data = m_groupData.GetGroupNotice(grID, groupNoticeID); | ||
883 | 851 | ||
884 | if (data != null) | 852 | if (data != null) |
885 | { | 853 | { |
886 | GroupRecord groupInfo = m_groupData.GetGroupRecord(grID, data.GroupID, null); | 854 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), data.GroupID, null); |
887 | 855 | ||
888 | GridInstantMessage msg = new GridInstantMessage(); | 856 | GridInstantMessage msg = new GridInstantMessage(); |
889 | msg.imSessionID = UUID.Zero.Guid; | 857 | msg.imSessionID = UUID.Zero.Guid; |
890 | msg.fromAgentID = data.GroupID.Guid; | 858 | msg.fromAgentID = data.GroupID.Guid; |
891 | msg.toAgentID = remoteClient.AgentId.Guid; | 859 | msg.toAgentID = GetRequestingAgentID(remoteClient).Guid; |
892 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | 860 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
893 | msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName; | 861 | msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName; |
894 | msg.message = data.noticeData.Subject + "|" + data.Message; | 862 | msg.message = data.noticeData.Subject + "|" + data.Message; |
@@ -900,7 +868,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
900 | msg.RegionID = UUID.Zero.Guid; | 868 | msg.RegionID = UUID.Zero.Guid; |
901 | msg.binaryBucket = data.BinaryBucket; | 869 | msg.binaryBucket = data.BinaryBucket; |
902 | 870 | ||
903 | OutgoingInstantMessage(msg, remoteClient.AgentId); | 871 | OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient)); |
904 | } | 872 | } |
905 | 873 | ||
906 | } | 874 | } |
@@ -920,7 +888,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
920 | msg.Position = Vector3.Zero; | 888 | msg.Position = Vector3.Zero; |
921 | msg.RegionID = UUID.Zero.Guid; | 889 | msg.RegionID = UUID.Zero.Guid; |
922 | 890 | ||
923 | GroupNoticeInfo info = m_groupData.GetGroupNotice(null, groupNoticeID); | 891 | GroupNoticeInfo info = m_groupData.GetGroupNotice(agentID, groupNoticeID); |
924 | if (info != null) | 892 | if (info != null) |
925 | { | 893 | { |
926 | msg.fromAgentID = info.GroupID.Guid; | 894 | msg.fromAgentID = info.GroupID.Guid; |
@@ -947,7 +915,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
947 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 915 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
948 | 916 | ||
949 | // Send agent information about his groups | 917 | // Send agent information about his groups |
950 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 918 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
951 | } | 919 | } |
952 | 920 | ||
953 | public void JoinGroupRequest(IClientAPI remoteClient, UUID groupID) | 921 | public void JoinGroupRequest(IClientAPI remoteClient, UUID groupID) |
@@ -955,19 +923,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
955 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 923 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
956 | 924 | ||
957 | // Should check to see if OpenEnrollment, or if there's an outstanding invitation | 925 | // Should check to see if OpenEnrollment, or if there's an outstanding invitation |
958 | m_groupData.AddAgentToGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, UUID.Zero); | 926 | m_groupData.AddAgentToGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, UUID.Zero); |
959 | 927 | ||
960 | remoteClient.SendJoinGroupReply(groupID, true); | 928 | remoteClient.SendJoinGroupReply(groupID, true); |
961 | 929 | ||
962 | // Should this send updates to everyone in the group? | 930 | // Should this send updates to everyone in the group? |
963 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 931 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
964 | } | 932 | } |
965 | 933 | ||
966 | public void LeaveGroupRequest(IClientAPI remoteClient, UUID groupID) | 934 | public void LeaveGroupRequest(IClientAPI remoteClient, UUID groupID) |
967 | { | 935 | { |
968 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 936 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
969 | 937 | ||
970 | m_groupData.RemoveAgentFromGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID); | 938 | m_groupData.RemoveAgentFromGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
971 | 939 | ||
972 | remoteClient.SendLeaveGroupReply(groupID, true); | 940 | remoteClient.SendLeaveGroupReply(groupID, true); |
973 | 941 | ||
@@ -975,21 +943,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
975 | 943 | ||
976 | // SL sends out notifcations to the group messaging session that the person has left | 944 | // SL sends out notifcations to the group messaging session that the person has left |
977 | // Should this also update everyone who is in the group? | 945 | // Should this also update everyone who is in the group? |
978 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 946 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
979 | } | 947 | } |
980 | 948 | ||
981 | public void EjectGroupMemberRequest(IClientAPI remoteClient, UUID groupID, UUID ejecteeID) | 949 | public void EjectGroupMemberRequest(IClientAPI remoteClient, UUID groupID, UUID ejecteeID) |
982 | { | 950 | { |
983 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 951 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
984 | 952 | ||
985 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
986 | 953 | ||
987 | // Todo: Security check? | 954 | // Todo: Security check? |
988 | m_groupData.RemoveAgentFromGroup(grID, ejecteeID, groupID); | 955 | m_groupData.RemoveAgentFromGroup(GetRequestingAgentID(remoteClient), ejecteeID, groupID); |
989 | 956 | ||
990 | remoteClient.SendEjectGroupMemberReply(remoteClient.AgentId, groupID, true); | 957 | remoteClient.SendEjectGroupMemberReply(GetRequestingAgentID(remoteClient), groupID, true); |
991 | 958 | ||
992 | GroupRecord groupInfo = m_groupData.GetGroupRecord(grID, groupID, null); | 959 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), groupID, null); |
993 | UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(ejecteeID); | 960 | UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(ejecteeID); |
994 | 961 | ||
995 | if ((groupInfo == null) || (userProfile == null)) | 962 | if ((groupInfo == null) || (userProfile == null)) |
@@ -1002,7 +969,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1002 | GridInstantMessage msg = new GridInstantMessage(); | 969 | GridInstantMessage msg = new GridInstantMessage(); |
1003 | 970 | ||
1004 | msg.imSessionID = UUID.Zero.Guid; | 971 | msg.imSessionID = UUID.Zero.Guid; |
1005 | msg.fromAgentID = remoteClient.AgentId.Guid; | 972 | msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid; |
1006 | // msg.fromAgentID = info.GroupID; | 973 | // msg.fromAgentID = info.GroupID; |
1007 | msg.toAgentID = ejecteeID.Guid; | 974 | msg.toAgentID = ejecteeID.Guid; |
1008 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | 975 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
@@ -1028,8 +995,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1028 | 995 | ||
1029 | msg = new GridInstantMessage(); | 996 | msg = new GridInstantMessage(); |
1030 | msg.imSessionID = UUID.Zero.Guid; | 997 | msg.imSessionID = UUID.Zero.Guid; |
1031 | msg.fromAgentID = remoteClient.AgentId.Guid; | 998 | msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid; |
1032 | msg.toAgentID = remoteClient.AgentId.Guid; | 999 | msg.toAgentID = GetRequestingAgentID(remoteClient).Guid; |
1033 | msg.timestamp = 0; | 1000 | msg.timestamp = 0; |
1034 | msg.fromAgentName = remoteClient.Name; | 1001 | msg.fromAgentName = remoteClient.Name; |
1035 | if (userProfile != null) | 1002 | if (userProfile != null) |
@@ -1047,7 +1014,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1047 | msg.Position = Vector3.Zero; | 1014 | msg.Position = Vector3.Zero; |
1048 | msg.RegionID = remoteClient.Scene.RegionInfo.RegionID.Guid; | 1015 | msg.RegionID = remoteClient.Scene.RegionInfo.RegionID.Guid; |
1049 | msg.binaryBucket = new byte[0]; | 1016 | msg.binaryBucket = new byte[0]; |
1050 | OutgoingInstantMessage(msg, remoteClient.AgentId); | 1017 | OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient)); |
1051 | 1018 | ||
1052 | 1019 | ||
1053 | // SL sends out messages to everyone in the group | 1020 | // SL sends out messages to everyone in the group |
@@ -1061,13 +1028,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1061 | 1028 | ||
1062 | // Todo: Security check, probably also want to send some kind of notification | 1029 | // Todo: Security check, probably also want to send some kind of notification |
1063 | UUID InviteID = UUID.Random(); | 1030 | UUID InviteID = UUID.Random(); |
1064 | GroupRequestID grid = GetClientGroupRequestID(remoteClient); | ||
1065 | 1031 | ||
1066 | m_groupData.AddAgentToGroupInvite(grid, InviteID, groupID, roleID, invitedAgentID); | 1032 | m_groupData.AddAgentToGroupInvite(GetRequestingAgentID(remoteClient), InviteID, groupID, roleID, invitedAgentID); |
1067 | 1033 | ||
1068 | // Check to see if the invite went through, if it did not then it's possible | 1034 | // Check to see if the invite went through, if it did not then it's possible |
1069 | // the remoteClient did not validate or did not have permission to invite. | 1035 | // the remoteClient did not validate or did not have permission to invite. |
1070 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(grid, InviteID); | 1036 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentID(remoteClient), InviteID); |
1071 | 1037 | ||
1072 | if (inviteInfo != null) | 1038 | if (inviteInfo != null) |
1073 | { | 1039 | { |
@@ -1079,7 +1045,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1079 | 1045 | ||
1080 | msg.imSessionID = inviteUUID; | 1046 | msg.imSessionID = inviteUUID; |
1081 | 1047 | ||
1082 | // msg.fromAgentID = remoteClient.AgentId.Guid; | 1048 | // msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid; |
1083 | msg.fromAgentID = groupID.Guid; | 1049 | msg.fromAgentID = groupID.Guid; |
1084 | msg.toAgentID = invitedAgentID.Guid; | 1050 | msg.toAgentID = invitedAgentID.Guid; |
1085 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | 1051 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
@@ -1132,57 +1098,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1132 | return child; | 1098 | return child; |
1133 | } | 1099 | } |
1134 | 1100 | ||
1135 | private GroupRequestID GetClientGroupRequestID(IClientAPI client) | ||
1136 | { | ||
1137 | if (client == null) | ||
1138 | { | ||
1139 | return new GroupRequestID(); | ||
1140 | } | ||
1141 | |||
1142 | lock (m_clientRequestIDInfo) | ||
1143 | { | ||
1144 | if (!m_clientRequestIDInfo.ContainsKey(client.AgentId)) | ||
1145 | { | ||
1146 | GroupRequestIDInfo info = new GroupRequestIDInfo(); | ||
1147 | info.RequestID.AgentID = client.AgentId; | ||
1148 | info.RequestID.SessionID = client.SessionId; | ||
1149 | |||
1150 | UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(client.AgentId); | ||
1151 | if (userProfile == null) | ||
1152 | { | ||
1153 | // This should be impossible. If I've been passed a reference to a client | ||
1154 | // that client should be registered with the UserService. So something | ||
1155 | // is horribly wrong somewhere. | ||
1156 | |||
1157 | m_log.WarnFormat("[GROUPS]: Could not find a user profile for {0} / {1}", client.Name, client.AgentId); | ||
1158 | |||
1159 | // Default to local user service and hope for the best? | ||
1160 | info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; | ||
1161 | |||
1162 | } | ||
1163 | else if (userProfile is ForeignUserProfileData) | ||
1164 | { | ||
1165 | // They aren't from around here | ||
1166 | ForeignUserProfileData fupd = (ForeignUserProfileData)userProfile; | ||
1167 | info.RequestID.UserServiceURL = fupd.UserServerURI; | ||
1168 | } | ||
1169 | else | ||
1170 | { | ||
1171 | // They're a local user, use this: | ||
1172 | info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; | ||
1173 | } | ||
1174 | |||
1175 | m_clientRequestIDInfo.Add(client.AgentId, info); | ||
1176 | } | ||
1177 | |||
1178 | m_clientRequestIDInfo[client.AgentId].LastUsedTMStamp = DateTime.Now; | ||
1179 | |||
1180 | return m_clientRequestIDInfo[client.AgentId].RequestID; | ||
1181 | } | ||
1182 | // Unreachable code! | ||
1183 | // return new GroupRequestID(); | ||
1184 | } | ||
1185 | |||
1186 | /// <summary> | 1101 | /// <summary> |
1187 | /// Send 'remoteClient' the group membership 'data' for agent 'dataForAgentID'. | 1102 | /// Send 'remoteClient' the group membership 'data' for agent 'dataForAgentID'. |
1188 | /// </summary> | 1103 | /// </summary> |
@@ -1231,6 +1146,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1231 | llDataStruct.Add("GroupData", GroupData); | 1146 | llDataStruct.Add("GroupData", GroupData); |
1232 | llDataStruct.Add("NewGroupData", NewGroupData); | 1147 | llDataStruct.Add("NewGroupData", NewGroupData); |
1233 | 1148 | ||
1149 | if (m_debugEnabled) | ||
1150 | { | ||
1151 | m_log.InfoFormat("[GROUPS]: {0}", OSDParser.SerializeJsonString(llDataStruct)); | ||
1152 | } | ||
1153 | |||
1234 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); | 1154 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); |
1235 | 1155 | ||
1236 | if (queue != null) | 1156 | if (queue != null) |
@@ -1308,7 +1228,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1308 | /// <returns></returns> | 1228 | /// <returns></returns> |
1309 | private GroupMembershipData[] GetProfileListedGroupMemberships(IClientAPI requestingClient, UUID dataForAgentID) | 1229 | private GroupMembershipData[] GetProfileListedGroupMemberships(IClientAPI requestingClient, UUID dataForAgentID) |
1310 | { | 1230 | { |
1311 | List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(requestingClient), dataForAgentID); | 1231 | List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(requestingClient.AgentId, dataForAgentID); |
1312 | GroupMembershipData[] membershipArray; | 1232 | GroupMembershipData[] membershipArray; |
1313 | 1233 | ||
1314 | if (requestingClient.AgentId != dataForAgentID) | 1234 | if (requestingClient.AgentId != dataForAgentID) |
@@ -1330,7 +1250,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1330 | m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); | 1250 | m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); |
1331 | foreach (GroupMembershipData membership in membershipArray) | 1251 | foreach (GroupMembershipData membership in membershipArray) |
1332 | { | 1252 | { |
1333 | m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2}", dataForAgentID, membership.GroupName, membership.GroupTitle); | 1253 | m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2} - {3}", dataForAgentID, membership.GroupName, membership.GroupTitle, membership.GroupPowers); |
1334 | } | 1254 | } |
1335 | } | 1255 | } |
1336 | 1256 | ||
@@ -1389,6 +1309,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1389 | } | 1309 | } |
1390 | 1310 | ||
1391 | #endregion | 1311 | #endregion |
1312 | |||
1313 | private UUID GetRequestingAgentID(IClientAPI client) | ||
1314 | { | ||
1315 | UUID requestingAgentID = UUID.Zero; | ||
1316 | if (client != null) | ||
1317 | { | ||
1318 | requestingAgentID = client.AgentId; | ||
1319 | } | ||
1320 | return requestingAgentID; | ||
1321 | } | ||
1392 | } | 1322 | } |
1393 | 1323 | ||
1324 | public class GroupNoticeInfo | ||
1325 | { | ||
1326 | public GroupNoticeData noticeData = new GroupNoticeData(); | ||
1327 | public UUID GroupID = UUID.Zero; | ||
1328 | public string Message = string.Empty; | ||
1329 | public byte[] BinaryBucket = new byte[0]; | ||
1330 | } | ||
1394 | } | 1331 | } |