aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs18
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 1829c8d..72ac303 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1510,11 +1510,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1510 1510
1511 for (int i=0; i<wearables.Length; i++) 1511 for (int i=0; i<wearables.Length; i++)
1512 { 1512 {
1513 if (inventoryMap.ContainsKey(wearables[i].ItemID)) 1513 if (inventoryMap.ContainsKey(wearables[i][0].ItemID))
1514 { 1514 {
1515 AvatarWearable wearable = new AvatarWearable(); 1515 AvatarWearable wearable = new AvatarWearable();
1516 wearable.AssetID = wearables[i].AssetID; 1516 wearable.Wear(inventoryMap[wearables[i][0].ItemID],
1517 wearable.ItemID = inventoryMap[wearables[i].ItemID]; 1517 wearables[i][0].AssetID);
1518 avatarAppearance.SetWearable(i, wearable); 1518 avatarAppearance.SetWearable(i, wearable);
1519 } 1519 }
1520 } 1520 }
@@ -1568,10 +1568,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1568 for (int i=0; i<wearables.Length; i++) 1568 for (int i=0; i<wearables.Length; i++)
1569 { 1569 {
1570 wearable = wearables[i]; 1570 wearable = wearables[i];
1571 if (wearable.ItemID != UUID.Zero) 1571 if (wearable[0].ItemID != UUID.Zero)
1572 { 1572 {
1573 // Get inventory item and copy it 1573 // Get inventory item and copy it
1574 InventoryItemBase item = new InventoryItemBase(wearable.ItemID, source); 1574 InventoryItemBase item = new InventoryItemBase(wearable[0].ItemID, source);
1575 item = inventoryService.GetItem(item); 1575 item = inventoryService.GetItem(item);
1576 1576
1577 if (item != null) 1577 if (item != null)
@@ -1602,13 +1602,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1602 1602
1603 // Wear item 1603 // Wear item
1604 AvatarWearable newWearable = new AvatarWearable(); 1604 AvatarWearable newWearable = new AvatarWearable();
1605 newWearable.AssetID = wearable.AssetID; 1605 newWearable.Wear(destinationItem.ID, wearable[0].AssetID);
1606 newWearable.ItemID = destinationItem.ID;
1607 avatarAppearance.SetWearable(i, newWearable); 1606 avatarAppearance.SetWearable(i, newWearable);
1608 } 1607 }
1609 else 1608 else
1610 { 1609 {
1611 m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID); 1610 m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable[0].ItemID, destinationFolder.ID);
1612 } 1611 }
1613 } 1612 }
1614 } 1613 }
@@ -2057,8 +2056,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2057 { 2056 {
2058 if (select && (GetStringAttribute(item, "wear", "false") == "true")) 2057 if (select && (GetStringAttribute(item, "wear", "false") == "true"))
2059 { 2058 {
2060 avatarAppearance.Wearables[inventoryItem.Flags].ItemID = inventoryItem.ID; 2059 avatarAppearance.Wearables[inventoryItem.Flags].Wear(inventoryItem.ID, inventoryItem.AssetID);
2061 avatarAppearance.Wearables[inventoryItem.Flags].AssetID = inventoryItem.AssetID;
2062 } 2060 }
2063 } 2061 }
2064 catch (Exception e) 2062 catch (Exception e)