From 818ed2032aa4e6c0a9ede3598d64f0c7960135c4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 30 Oct 2010 00:41:36 +0100
Subject: READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and
 INCOMPLETE. It contains a major interface version bump and will NOT work with
 earlier grid services. This is preliminary work that will lead to layers
 support. Rest appearance services are commented out completely, they will
 have to be adapted by someone who actually uses them. Remote admin is
 working, but has no layers support. There is no layers support in the
 database. Login likely won't work. You have been warned.

---
 .../RemoteController/RemoteAdminPlugin.cs              | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')

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
 
                 for (int i=0; i<wearables.Length; i++)
                 {
-                    if (inventoryMap.ContainsKey(wearables[i].ItemID))
+                    if (inventoryMap.ContainsKey(wearables[i][0].ItemID))
                     {
                         AvatarWearable wearable = new AvatarWearable();
-                        wearable.AssetID = wearables[i].AssetID;
-                        wearable.ItemID  = inventoryMap[wearables[i].ItemID];
+                        wearable.Wear(inventoryMap[wearables[i][0].ItemID],
+                                wearables[i][0].AssetID);
                         avatarAppearance.SetWearable(i, wearable);
                     }
                 }
@@ -1568,10 +1568,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             for (int i=0; i<wearables.Length; i++)
             {
                 wearable = wearables[i];
-                if (wearable.ItemID != UUID.Zero)
+                if (wearable[0].ItemID != UUID.Zero)
                 {
                     // Get inventory item and copy it
-                    InventoryItemBase item = new InventoryItemBase(wearable.ItemID, source);
+                    InventoryItemBase item = new InventoryItemBase(wearable[0].ItemID, source);
                     item = inventoryService.GetItem(item);
 
                     if (item != null)
@@ -1602,13 +1602,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                         // Wear item
                         AvatarWearable newWearable = new AvatarWearable();
-                        newWearable.AssetID = wearable.AssetID;
-                        newWearable.ItemID  = destinationItem.ID;
+                        newWearable.Wear(destinationItem.ID, wearable[0].AssetID);
                         avatarAppearance.SetWearable(i, newWearable);
                     }
                     else
                     {
-                        m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID);
+                        m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable[0].ItemID, destinationFolder.ID);
                     }
                 }
             }
@@ -2057,8 +2056,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                         {
                                         if (select && (GetStringAttribute(item, "wear", "false") == "true"))
                                             {
-                                                avatarAppearance.Wearables[inventoryItem.Flags].ItemID = inventoryItem.ID;
-                                                avatarAppearance.Wearables[inventoryItem.Flags].AssetID = inventoryItem.AssetID;
+                                                avatarAppearance.Wearables[inventoryItem.Flags].Wear(inventoryItem.ID, inventoryItem.AssetID);
                                             }
                                         }
                                         catch (Exception e)
-- 
cgit v1.1