diff options
| author | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
| commit | 4468aa0dcfebb045bc54df1f67f021f85f9bc4b6 (patch) | |
| tree | f52b7cf28acfe4bdbdff7ed7dfd112c6dd6b16fb /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |
| parent | Finally remove the requirement for an InventoryItem/FolderBase object to (diff) | |
| parent | New config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff) | |
| download | opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2 opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 9a1cef4..cc614f3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -579,12 +579,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 579 | Enqueue(item, avatarID); | 579 | Enqueue(item, avatarID); |
| 580 | } | 580 | } |
| 581 | 581 | ||
| 582 | public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID) | ||
| 583 | { | ||
| 584 | OSD item = EventQueueHelper.GroupMembership(groupUpdate); | ||
| 585 | Enqueue(item, avatarID); | ||
| 586 | } | ||
| 587 | |||
| 588 | public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) | 582 | public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) |
| 589 | { | 583 | { |
| 590 | OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data); | 584 | OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data); |