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

a few small changes to AvatarCreationModule

0.6.6-post-fixes
MW 2009-05-30 13:39:07 +00:00
parent 69817b4d6a
commit ea02a24161
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
View File

@ -123,7 +123,7 @@ namespace OpenSim.Grid.UserServer.Modules
public bool CloneAvatar(Guid avatarID, Guid templateID) public bool CloneAvatar(Guid avatarID, Guid templateID)
{ {
m_log.InfoFormat("[AvatarAppearance] Starting to create avatar's appearance for user {0}", avatarID.ToString()); m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString());
Guid bodyFolder = Guid.Empty; Guid bodyFolder = Guid.Empty;
Guid clothesFolder = Guid.Empty; Guid clothesFolder = Guid.Empty;
bool success = false; bool success = false;
@ -296,25 +296,28 @@ namespace OpenSim.Grid.UserServer.Modules
return UUID.Zero; return UUID.Zero;
} }
private static void ModifyPermissions(InventoryItemBase clonedItem) private void ModifyPermissions(InventoryItemBase item)
{ {
if ((clonedItem.CurrentPermissions & (uint)PermissionMask.Modify) == 0) if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
clonedItem.CurrentPermissions |= (uint)PermissionMask.Modify; item.CurrentPermissions |= (uint)PermissionMask.Modify;
if ((clonedItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
clonedItem.CurrentPermissions |= (uint)PermissionMask.Copy; item.CurrentPermissions |= (uint)PermissionMask.Copy;
if ((clonedItem.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
clonedItem.CurrentPermissions &= ~(uint)PermissionMask.Transfer; item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
if ((clonedItem.NextPermissions & (uint)PermissionMask.Modify) == 0) if ((item.NextPermissions & (uint)PermissionMask.Modify) == 0)
clonedItem.NextPermissions |= (uint)PermissionMask.Modify; item.NextPermissions |= (uint)PermissionMask.Modify;
if ((clonedItem.NextPermissions & (uint)PermissionMask.Copy) == 0) if ((item.NextPermissions & (uint)PermissionMask.Copy) == 0)
clonedItem.NextPermissions |= (uint)PermissionMask.Copy; item.NextPermissions |= (uint)PermissionMask.Copy;
if ((clonedItem.NextPermissions & (uint)PermissionMask.Transfer) != 0) if ((item.NextPermissions & (uint)PermissionMask.Transfer) != 0)
clonedItem.NextPermissions &= ~(uint)PermissionMask.Transfer; item.NextPermissions &= ~(uint)PermissionMask.Transfer;
if ((item.EveryOnePermissions & (uint)PermissionMask.Transfer) != 0)
item.EveryOnePermissions &= ~(uint)PermissionMask.Transfer;
} }
private AvatarAppearance CreateDefaultAppearance(UUID avatarId) private AvatarAppearance CreateDefaultAppearance(UUID avatarId)