diff options
| author | Diva Canto | 2012-04-06 11:52:38 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-06 11:52:38 -0700 |
| commit | 4c32f79c10bf38985fc9f4154aa14be4f604b93c (patch) | |
| tree | 35f22541723717f19345dbcb308860d6a816a154 /OpenSim/Region/OptionalModules | |
| parent | If an AddItem fails, try adding it to the right folder type. (diff) | |
| parent | Added missing refresh of group membership client side cache to the groups mod... (diff) | |
| download | opensim-SC_OLD-4c32f79c10bf38985fc9f4154aa14be4f604b93c.zip opensim-SC_OLD-4c32f79c10bf38985fc9f4154aa14be4f604b93c.tar.gz opensim-SC_OLD-4c32f79c10bf38985fc9f4154aa14be4f604b93c.tar.bz2 opensim-SC_OLD-4c32f79c10bf38985fc9f4154aa14be4f604b93c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 2a15e5d..e669f4c 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
| @@ -1294,7 +1294,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 1294 | 1294 | ||
| 1295 | OnAgentDataUpdateRequest(remoteClient, dataForAgentID, UUID.Zero); | 1295 | OnAgentDataUpdateRequest(remoteClient, dataForAgentID, UUID.Zero); |
| 1296 | 1296 | ||
| 1297 | |||
| 1298 | // Need to send a group membership update to the client | 1297 | // Need to send a group membership update to the client |
| 1299 | // UDP version doesn't seem to behave nicely. But we're going to send it out here | 1298 | // UDP version doesn't seem to behave nicely. But we're going to send it out here |
| 1300 | // with an empty group membership to hopefully remove groups being displayed due | 1299 | // with an empty group membership to hopefully remove groups being displayed due |
| @@ -1305,6 +1304,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 1305 | SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray); | 1304 | SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray); |
| 1306 | remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray); | 1305 | remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray); |
| 1307 | 1306 | ||
| 1307 | if (remoteClient.AgentId == dataForAgentID) | ||
| 1308 | remoteClient.RefreshGroupMembership(); | ||
| 1308 | } | 1309 | } |
| 1309 | 1310 | ||
| 1310 | /// <summary> | 1311 | /// <summary> |