aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2009-05-30 13:39:07 +0000
committerMW2009-05-30 13:39:07 +0000
commitea02a241617a5a5af23b6c2edd71bf294a6a0fad (patch)
tree7cb77b3dc732456a7b0ab602344c79ae940a7e8e /OpenSim/Grid
parentAdded a AvatarCreationModule to the user server. This handles the "cloning" o... (diff)
downloadopensim-SC_OLD-ea02a241617a5a5af23b6c2edd71bf294a6a0fad.zip
opensim-SC_OLD-ea02a241617a5a5af23b6c2edd71bf294a6a0fad.tar.gz
opensim-SC_OLD-ea02a241617a5a5af23b6c2edd71bf294a6a0fad.tar.bz2
opensim-SC_OLD-ea02a241617a5a5af23b6c2edd71bf294a6a0fad.tar.xz
a few small changes to AvatarCreationModule
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs31
1 files changed, 17 insertions, 14 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
index 5e6bc85..5507f5c 100644
--- a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Grid.UserServer.Modules
123 123
124 public bool CloneAvatar(Guid avatarID, Guid templateID) 124 public bool CloneAvatar(Guid avatarID, Guid templateID)
125 { 125 {
126 m_log.InfoFormat("[AvatarAppearance] Starting to create avatar's appearance for user {0}", avatarID.ToString()); 126 m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString());
127 Guid bodyFolder = Guid.Empty; 127 Guid bodyFolder = Guid.Empty;
128 Guid clothesFolder = Guid.Empty; 128 Guid clothesFolder = Guid.Empty;
129 bool success = false; 129 bool success = false;
@@ -296,25 +296,28 @@ namespace OpenSim.Grid.UserServer.Modules
296 return UUID.Zero; 296 return UUID.Zero;
297 } 297 }
298 298
299 private static void ModifyPermissions(InventoryItemBase clonedItem) 299 private void ModifyPermissions(InventoryItemBase item)
300 { 300 {
301 if ((clonedItem.CurrentPermissions & (uint)PermissionMask.Modify) == 0) 301 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
302 clonedItem.CurrentPermissions |= (uint)PermissionMask.Modify; 302 item.CurrentPermissions |= (uint)PermissionMask.Modify;
303 303
304 if ((clonedItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 304 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
305 clonedItem.CurrentPermissions |= (uint)PermissionMask.Copy; 305 item.CurrentPermissions |= (uint)PermissionMask.Copy;
306 306
307 if ((clonedItem.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) 307 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
308 clonedItem.CurrentPermissions &= ~(uint)PermissionMask.Transfer; 308 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
309 309
310 if ((clonedItem.NextPermissions & (uint)PermissionMask.Modify) == 0) 310 if ((item.NextPermissions & (uint)PermissionMask.Modify) == 0)
311 clonedItem.NextPermissions |= (uint)PermissionMask.Modify; 311 item.NextPermissions |= (uint)PermissionMask.Modify;
312 312
313 if ((clonedItem.NextPermissions & (uint)PermissionMask.Copy) == 0) 313 if ((item.NextPermissions & (uint)PermissionMask.Copy) == 0)
314 clonedItem.NextPermissions |= (uint)PermissionMask.Copy; 314 item.NextPermissions |= (uint)PermissionMask.Copy;
315 315
316 if ((clonedItem.NextPermissions & (uint)PermissionMask.Transfer) != 0) 316 if ((item.NextPermissions & (uint)PermissionMask.Transfer) != 0)
317 clonedItem.NextPermissions &= ~(uint)PermissionMask.Transfer; 317 item.NextPermissions &= ~(uint)PermissionMask.Transfer;
318
319 if ((item.EveryOnePermissions & (uint)PermissionMask.Transfer) != 0)
320 item.EveryOnePermissions &= ~(uint)PermissionMask.Transfer;
318 } 321 }
319 322
320 private AvatarAppearance CreateDefaultAppearance(UUID avatarId) 323 private AvatarAppearance CreateDefaultAppearance(UUID avatarId)