OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug where objects couldn't be set back to the "none" group. 

This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-17 02:35:08 +00:00
parent 67a2d6d855
commit cc5e28c1c1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -339,15 +339,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private void HandleObjectGroupUpdate( private void HandleObjectGroupUpdate(
IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage)
{ {
GroupMembershipData gmd = GetMembershipData(GroupID, remoteClient.AgentId); // XXX: Might be better to get rid of this special casing and have GetMembershipData return something
// reasonable for a UUID.Zero group.
if (gmd == null) if (GroupID != UUID.Zero)
{ {
// m_log.WarnFormat( GroupMembershipData gmd = GetMembershipData(GroupID, remoteClient.AgentId);
// "[GROUPS]: User {0} is not a member of group {1} so they can't update {2} to this group",
// remoteClient.Name, GroupID, objectLocalID);
return; if (gmd == null)
{
// m_log.WarnFormat(
// "[GROUPS]: User {0} is not a member of group {1} so they can't update {2} to this group",
// remoteClient.Name, GroupID, objectLocalID);
return;
}
} }
SceneObjectGroup so = ((Scene)remoteClient.Scene).GetGroupByPrim(objectLocalID); SceneObjectGroup so = ((Scene)remoteClient.Scene).GetGroupByPrim(objectLocalID);