diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 2e1c87e..4ac9ada 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1628,11 +1628,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1628 | 1628 | ||
1629 | for (int i=0; i<wearables.Length; i++) | 1629 | for (int i=0; i<wearables.Length; i++) |
1630 | { | 1630 | { |
1631 | if (inventoryMap.ContainsKey(wearables[i].ItemID)) | 1631 | if (inventoryMap.ContainsKey(wearables[i][0].ItemID)) |
1632 | { | 1632 | { |
1633 | AvatarWearable wearable = new AvatarWearable(); | 1633 | AvatarWearable wearable = new AvatarWearable(); |
1634 | wearable.AssetID = wearables[i].AssetID; | 1634 | wearable.Wear(inventoryMap[wearables[i][0].ItemID], |
1635 | wearable.ItemID = inventoryMap[wearables[i].ItemID]; | 1635 | wearables[i][0].AssetID); |
1636 | avatarAppearance.SetWearable(i, wearable); | 1636 | avatarAppearance.SetWearable(i, wearable); |
1637 | } | 1637 | } |
1638 | } | 1638 | } |
@@ -1686,10 +1686,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1686 | for (int i=0; i<wearables.Length; i++) | 1686 | for (int i=0; i<wearables.Length; i++) |
1687 | { | 1687 | { |
1688 | wearable = wearables[i]; | 1688 | wearable = wearables[i]; |
1689 | if (wearable.ItemID != UUID.Zero) | 1689 | if (wearable[0].ItemID != UUID.Zero) |
1690 | { | 1690 | { |
1691 | // Get inventory item and copy it | 1691 | // Get inventory item and copy it |
1692 | InventoryItemBase item = new InventoryItemBase(wearable.ItemID, source); | 1692 | InventoryItemBase item = new InventoryItemBase(wearable[0].ItemID, source); |
1693 | item = inventoryService.GetItem(item); | 1693 | item = inventoryService.GetItem(item); |
1694 | 1694 | ||
1695 | if (item != null) | 1695 | if (item != null) |
@@ -1720,13 +1720,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1720 | 1720 | ||
1721 | // Wear item | 1721 | // Wear item |
1722 | AvatarWearable newWearable = new AvatarWearable(); | 1722 | AvatarWearable newWearable = new AvatarWearable(); |
1723 | newWearable.AssetID = wearable.AssetID; | 1723 | newWearable.Wear(destinationItem.ID, wearable[0].AssetID); |
1724 | newWearable.ItemID = destinationItem.ID; | ||
1725 | avatarAppearance.SetWearable(i, newWearable); | 1724 | avatarAppearance.SetWearable(i, newWearable); |
1726 | } | 1725 | } |
1727 | else | 1726 | else |
1728 | { | 1727 | { |
1729 | m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID); | 1728 | m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable[0].ItemID, destinationFolder.ID); |
1730 | } | 1729 | } |
1731 | } | 1730 | } |
1732 | } | 1731 | } |
@@ -2175,8 +2174,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2175 | { | 2174 | { |
2176 | if (select && (GetStringAttribute(item, "wear", "false") == "true")) | 2175 | if (select && (GetStringAttribute(item, "wear", "false") == "true")) |
2177 | { | 2176 | { |
2178 | avatarAppearance.Wearables[inventoryItem.Flags].ItemID = inventoryItem.ID; | 2177 | avatarAppearance.Wearables[inventoryItem.Flags].Wear(inventoryItem.ID, inventoryItem.AssetID); |
2179 | avatarAppearance.Wearables[inventoryItem.Flags].AssetID = inventoryItem.AssetID; | ||
2180 | } | 2178 | } |
2181 | } | 2179 | } |
2182 | catch (Exception e) | 2180 | catch (Exception e) |