4 files changed, 37 insertions, 14 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0ea33ff..99041c1 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -239,6 +239,17 @@ namespace OpenSim.Framework.Communications.Cache
             //Todo should delete it from memory too
         }
 
+        public AssetBase CopyAsset(LLUUID assetID)
+        {
+            AssetBase asset = GetAsset(assetID);
+            if (asset == null)
+                return null;
+
+            asset.FullID = LLUUID.Random(); // TODO: check for conflicts
+            AddAsset(asset);
+            return asset;
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 05caa84..62251bc 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -88,7 +88,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002");
             item.inventoryDescription = "Plywood texture";
             item.inventoryName = "Plywood";
-            item.assetType = 0;
+            item.assetType = (int) AssetType.Texture;
+            item.invType = (int) InventoryType.Texture;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -103,7 +104,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000003");
             item.inventoryDescription = "Rocks texture";
             item.inventoryName = "Rocks";
-            item.assetType = 0;
+            item.assetType = (int) AssetType.Texture;
+            item.invType = (int) InventoryType.Texture;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -118,7 +120,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000001");
             item.inventoryDescription = "Bricks texture";
             item.inventoryName = "Bricks";
-            item.assetType = 0;
+            item.assetType = (int) AssetType.Texture;
+            item.invType = (int) InventoryType.Texture;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -133,7 +136,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000004");
             item.inventoryDescription = "Granite texture";
             item.inventoryName = "Granite";
-            item.assetType = 0;
+            item.assetType = (int) AssetType.Texture;
+            item.invType = (int) InventoryType.Texture;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -148,7 +152,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000005");
             item.inventoryDescription = "Hardwood texture";
             item.inventoryName = "Hardwood";
-            item.assetType = 0;
+            item.assetType = (int) AssetType.Texture;
+            item.invType = (int) InventoryType.Texture;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -163,8 +168,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
             item.inventoryDescription = "Default Shape";
             item.inventoryName = "Default Shape";
-            item.assetType = 13;
-            item.invType = 18;
+            item.assetType = (int) AssetType.Bodypart;
+            item.invType = (int) InventoryType.Wearable;
             item.parentFolderID = folderID;
             item.inventoryCurrentPermissions = 0;
             item.inventoryNextPermissions = 0;
@@ -177,8 +182,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
             item.inventoryDescription = "Default Skin";
             item.inventoryName = "Default Skin";
-            item.assetType = 13;
-            item.invType = 18;
+            item.assetType = (int) AssetType.Bodypart;
+            item.invType = (int) InventoryType.Wearable;
             item.parentFolderID = folderID;
             item.inventoryCurrentPermissions = 0;
             item.inventoryNextPermissions = 0;
@@ -191,8 +196,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111110");
             item.inventoryDescription = "Default Shirt";
             item.inventoryName = "Default Shirt";
-            item.assetType = 5;
-            item.invType = 18;
+            item.assetType = (int) AssetType.Clothing;
+            item.invType = (int) InventoryType.Wearable;
             item.parentFolderID = folderID;
             item.inventoryCurrentPermissions = 0;
             item.inventoryNextPermissions = 0;
@@ -205,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111120");
             item.inventoryDescription = "Default Pants";
             item.inventoryName = "Default Pants";
-            item.assetType = 5;
-            item.invType = 18;
+            item.assetType = (int) AssetType.Clothing;
+            item.invType = (int) InventoryType.Wearable;
             item.parentFolderID = folderID;
             item.inventoryCurrentPermissions = 0;
             item.inventoryNextPermissions = 0;
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 74b2440..117ed36 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -74,7 +74,10 @@ namespace OpenSim.Framework.Communications.Cache
 
         public CachedUserInfo GetUserDetails(LLUUID userID)
         {
-            return m_userProfiles[userID];
+            if (m_userProfiles.ContainsKey(userID))
+                return m_userProfiles[userID];
+            else
+                return null;
         }
 
         public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType,
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ada5ff0..23181bf 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -272,6 +272,9 @@ namespace OpenSim.Framework
     public delegate void UpdateInventoryItemTransaction(
         IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID);
 
+    public delegate void CopyInventoryItem(
+        IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, LLUUID newFolderID, string newName);
+
     public delegate void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID);
 
     public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID);
@@ -344,6 +347,7 @@ namespace OpenSim.Framework
         event FetchInventory OnFetchInventory;
         event RequestTaskInventory OnRequestTaskInventory;
         event UpdateInventoryItemTransaction OnUpdateInventoryItem;
+        event CopyInventoryItem OnCopyInventoryItem;
         event UDPAssetUploadRequest OnAssetUploadRequest;
         event XferReceive OnXferReceive;
         event RequestXfer OnRequestXfer;