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

OOps my bad, always do deep copy, let viewers do v1 v2 fixes

httptests
UbitUmarov 2018-05-12 21:35:25 +01:00
parent 468b25ff69
commit fbb77274da
1 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@ -878,72 +878,73 @@ namespace OpenSim.Services.UserAccountService
// Wearables // Wearables
AvatarWearable basewearable; AvatarWearable basewearable;
AvatarWearable newbasewearable;
WearableItem wearable; WearableItem wearable;
AvatarWearable newbasewearable = new AvatarWearable();
// copy wearables creating new inventory entries // copy wearables creating new inventory entries
// converting from v1.0 wearables to v2.0
for (int i = 0; i < wearables.Length; i++) for (int i = 0; i < wearables.Length; i++)
{ {
basewearable = wearables[i]; basewearable = wearables[i];
if(basewearable == null || basewearable.Count == 0) if(basewearable == null || basewearable.Count == 0)
continue; continue;
newbasewearable = new AvatarWearable(); newbasewearable.Clear();
int j = basewearable.Count - 1; for(int j = 0; j < basewearable.Count; j++)
wearable = basewearable[j];
if (wearable.ItemID != UUID.Zero)
{ {
m_log.DebugFormat("[XXX]: Getting item {0} from avie {1}", wearable.ItemID, source); wearable = basewearable[j];
// Get inventory item and copy it if (wearable.ItemID != UUID.Zero)
InventoryItemBase item = m_InventoryService.GetItem(source, wearable.ItemID);
if(item != null && item.AssetType == (int)AssetType.Link)
{ {
if(item.AssetID == UUID.Zero ) m_log.DebugFormat("[XXX]: Getting item {0} from avie {1} for {2} {3}",
item = null; wearable.ItemID, source, i, j);
// Get inventory item and copy it
InventoryItemBase item = m_InventoryService.GetItem(source, wearable.ItemID);
if(item != null && item.AssetType == (int)AssetType.Link)
{
if(item.AssetID == UUID.Zero )
item = null;
else
item = m_InventoryService.GetItem(source, item.AssetID);
}
if (item != null)
{
InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
destinationItem.Name = item.Name;
destinationItem.Owner = destination;
destinationItem.Description = item.Description;
destinationItem.InvType = item.InvType;
destinationItem.CreatorId = item.CreatorId;
destinationItem.CreatorData = item.CreatorData;
destinationItem.NextPermissions = item.NextPermissions;
destinationItem.CurrentPermissions = item.CurrentPermissions;
destinationItem.BasePermissions = item.BasePermissions;
destinationItem.EveryOnePermissions = item.EveryOnePermissions;
destinationItem.GroupPermissions = item.GroupPermissions;
destinationItem.AssetType = item.AssetType;
destinationItem.AssetID = item.AssetID;
destinationItem.GroupID = item.GroupID;
destinationItem.GroupOwned = item.GroupOwned;
destinationItem.SalePrice = item.SalePrice;
destinationItem.SaleType = item.SaleType;
destinationItem.Flags = item.Flags;
destinationItem.CreationDate = item.CreationDate;
destinationItem.Folder = destinationFolder.ID;
ApplyNextOwnerPermissions(destinationItem);
m_InventoryService.AddItem(destinationItem);
m_log.DebugFormat("[USER ACCOUNT SERVICE]: Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
// Wear item
newbasewearable.Add(destinationItem.ID,wearable.AssetID);
// Add to Current Outfit
CreateCurrentOutfitLink((int)InventoryType.Wearable, item.Flags, item.Name, destinationItem.ID, destination, currentOutfitFolder.ID);
}
else else
item = m_InventoryService.GetItem(source, item.AssetID); {
} m_log.WarnFormat("[USER ACCOUNT SERVICE]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID);
}
if (item != null)
{
InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
destinationItem.Name = item.Name;
destinationItem.Owner = destination;
destinationItem.Description = item.Description;
destinationItem.InvType = item.InvType;
destinationItem.CreatorId = item.CreatorId;
destinationItem.CreatorData = item.CreatorData;
destinationItem.NextPermissions = item.NextPermissions;
destinationItem.CurrentPermissions = item.CurrentPermissions;
destinationItem.BasePermissions = item.BasePermissions;
destinationItem.EveryOnePermissions = item.EveryOnePermissions;
destinationItem.GroupPermissions = item.GroupPermissions;
destinationItem.AssetType = item.AssetType;
destinationItem.AssetID = item.AssetID;
destinationItem.GroupID = item.GroupID;
destinationItem.GroupOwned = item.GroupOwned;
destinationItem.SalePrice = item.SalePrice;
destinationItem.SaleType = item.SaleType;
destinationItem.Flags = item.Flags;
destinationItem.CreationDate = item.CreationDate;
destinationItem.Folder = destinationFolder.ID;
ApplyNextOwnerPermissions(destinationItem);
m_InventoryService.AddItem(destinationItem);
m_log.DebugFormat("[USER ACCOUNT SERVICE]: Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
// Wear item
newbasewearable.Add(destinationItem.ID,wearable.AssetID);
// Add to Current Outfit
CreateCurrentOutfitLink((int)InventoryType.Wearable, item.Flags, item.Name, destinationItem.ID, destination, currentOutfitFolder.ID);
}
else
{
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID);
} }
} }
avatarAppearance.SetWearable(i, newbasewearable); avatarAppearance.SetWearable(i, newbasewearable);