aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMichael Cortez2009-09-16 16:12:23 -0700
committerJustin Clark-Casey (justincc)2009-09-18 20:54:01 +0100
commit65b9084c65f61e5ddb2d4e106aff6ce4f899f2b6 (patch)
tree13d4f41646fcdd42d35296c1f54b48130e671316
parentTry to filter the groups list returns for User A, when sending to User B, bas... (diff)
downloadopensim-SC-65b9084c65f61e5ddb2d4e106aff6ce4f899f2b6.zip
opensim-SC-65b9084c65f61e5ddb2d4e106aff6ce4f899f2b6.tar.gz
opensim-SC-65b9084c65f61e5ddb2d4e106aff6ce4f899f2b6.tar.bz2
opensim-SC-65b9084c65f61e5ddb2d4e106aff6ce4f899f2b6.tar.xz
Add a little debugging for filtered groups lists based on requester
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs19
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 79d7477..9d56ba8 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1191,6 +1191,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1191 1191
1192 foreach (GroupMembershipData membership in data) 1192 foreach (GroupMembershipData membership in data)
1193 { 1193 {
1194 if (remoteClient.AgentId != dataForAgentID)
1195 {
1196 if (!membership.ListInProfile)
1197 {
1198 // If we're sending group info to remoteclient about another agent,
1199 // filter out groups the other agent doesn't want to share.
1200 continue;
1201 }
1202 }
1203
1194 OSDMap GroupDataMap = new OSDMap(6); 1204 OSDMap GroupDataMap = new OSDMap(6);
1195 OSDMap NewGroupDataMap = new OSDMap(1); 1205 OSDMap NewGroupDataMap = new OSDMap(1);
1196 1206
@@ -1292,6 +1302,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1292 membershipArray = membershipData.ToArray(); 1302 membershipArray = membershipData.ToArray();
1293 } 1303 }
1294 1304
1305 if (m_debugEnabled)
1306 {
1307 m_log.InfoFormat("[GROUPS]: Sending group membership information for {0} to {1}", dataForAgentID, remoteClient.AgentId);
1308 foreach (GroupMembershipData membership in membershipArray)
1309 {
1310 m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2}", dataForAgentID, membership.GroupName, membership.GroupTitle);
1311 }
1312 }
1313
1295 SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray); 1314 SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray);
1296 remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray); 1315 remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray);
1297 1316