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/Addons | |
| 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_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2 opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Addons')
| -rw-r--r-- | OpenSim/Addons/Groups/GroupsModule.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index ccd4da6..1afdd0f 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
| @@ -1276,13 +1276,9 @@ namespace OpenSim.Groups | |||
| 1276 | SendDataUpdate(remoteClient, tellOthers); | 1276 | SendDataUpdate(remoteClient, tellOthers); |
| 1277 | 1277 | ||
| 1278 | GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID); | 1278 | GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID); |
| 1279 | IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); | ||
| 1280 | if (eq != null) | ||
| 1281 | eq.GroupMembershipData(agentID, membershipArray); | ||
| 1282 | else | ||
| 1283 | remoteClient.SendGroupMembership(membershipArray); | ||
| 1284 | 1279 | ||
| 1285 | remoteClient.RefreshGroupMembership(); | 1280 | remoteClient.RefreshGroupMembership(); |
| 1281 | remoteClient.SendAgentGroupDataUpdate(agentID, membershipArray); | ||
| 1286 | } | 1282 | } |
| 1287 | 1283 | ||
| 1288 | /// <summary> | 1284 | /// <summary> |