3 files changed, 186 insertions, 186 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
index 3acaa21..73a5a3a 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
@@ -1,29 +1,29 @@
 /**
  * Copyright (c) 2008, Contributors. All rights reserved.
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
+ *
+ *     * Redistributions of source code must retain the above copyright notice,
  *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
  *       and/or other materials provided with the distribution.
  *     * Neither the name of the Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from 
+ *       Contributors may be used to endorse or promote products derived from
  *       this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 using System;
@@ -48,7 +48,7 @@ using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Scenes.Hypergrid
 {
-    public class HGAssetMapper 
+    public class HGAssetMapper
     {
         #region Fields
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -128,12 +128,12 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
 
                 if (m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset) && (asset != null))
                 {
-                    m_log.Debug("[HGScene]: Asset made it to asset cache. " + asset.Name + " " + assetID);
-                    // I think I need to store it in the asset DB too. 
+                    m_log.Debug("[HGScene]: Asset made it to asset cache. " + asset.Metadata.Name + " " + assetID);
+                    // I think I need to store it in the asset DB too.
                     // For now, let me just do it for textures and scripts
-                    if (((AssetType)asset.Type == AssetType.Texture) ||
-                        ((AssetType)asset.Type == AssetType.LSLBytecode) ||
-                        ((AssetType)asset.Type == AssetType.LSLText))
+                    if (((AssetType)asset.Metadata.Type == AssetType.Texture) ||
+                        ((AssetType)asset.Metadata.Type == AssetType.LSLBytecode) ||
+                        ((AssetType)asset.Metadata.Type == AssetType.LSLText))
                     {
                         AssetBase asset1 = new AssetBase();
                         Copy(asset, asset1);
@@ -157,9 +157,9 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
             if (asset1 != null)
             {
                 // See long comment in AssetCache.AddAsset
-                if (!asset1.Temporary || asset1.Local)
+                if (!asset1.Metadata.Temporary || asset1.Metadata.Local)
                 {
-                    // The asset cache returns instances of subclasses of AssetBase: 
+                    // The asset cache returns instances of subclasses of AssetBase:
                     // TextureImage or AssetInfo. So in passing them to the remote
                     // server we first need to convert this to instances of AssetBase,
                     // which is the serializable class for assets.
@@ -179,14 +179,14 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
         private void Copy(AssetBase from, AssetBase to)
         {
             to.Data         = from.Data;
-            to.Description  = from.Description;
-            to.FullID       = from.FullID;
-            to.ID           = from.ID;
-            to.Local        = from.Local;
-            to.Name         = from.Name;
-            to.Temporary    = from.Temporary;
-            to.Type         = from.Type;
-            
+            to.Metadata.Description  = from.Metadata.Description;
+            to.Metadata.FullID       = from.Metadata.FullID;
+            to.Metadata.ID           = from.Metadata.ID;
+            to.Metadata.Local        = from.Metadata.Local;
+            to.Metadata.Name         = from.Metadata.Name;
+            to.Metadata.Temporary    = from.Metadata.Temporary;
+            to.Metadata.Type         = from.Metadata.Type;
+
         }
 
         private void _guardedAdd(Dictionary<UUID, bool> lst, UUID obj, bool val)
@@ -243,7 +243,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
         private Dictionary<UUID, bool> SniffUUIDs(AssetBase asset)
         {
             Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>();
-            if ((asset != null) && ((AssetType)asset.Type == AssetType.Object))
+            if ((asset != null) && ((AssetType)asset.Metadata.Type == AssetType.Object))
             {
                 string ass_str = Utils.BytesToString(asset.Data);
                 SceneObjectGroup sog = new SceneObjectGroup(ass_str, true);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 58ab058..cb9aee2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -42,12 +42,12 @@ namespace OpenSim.Region.Environment.Scenes
     public partial class Scene
     {
         private static readonly ILog m_log
-            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);   
-        
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// Allows asynchronous derezzing of objects from the scene into a client's inventory.
         /// </summary>
-        protected AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;    
+        protected AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;
 
         /// <summary>
         /// Start all the scripts in the scene which should be started.
@@ -145,9 +145,9 @@ namespace OpenSim.Region.Environment.Scenes
             else
             {
                 m_log.ErrorFormat(
-                    "[AGENT INVENTORY]: Could not resolve user {0} for adding an inventory item", 
+                    "[AGENT INVENTORY]: Could not resolve user {0} for adding an inventory item",
                     remoteClient.AgentId);
-            }            
+            }
         }
 
         /// <summary>
@@ -175,7 +175,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
                                 return UUID.Zero;
                             }
-                            
+
                             remoteClient.SendAgentAlertMessage("Notecard saved", false);
                         }
                         else if ((InventoryType)item.InvType == InventoryType.LSL)
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
                                 return UUID.Zero;
                             }
-                            
+
                             remoteClient.SendAgentAlertMessage("Script saved", false);
                         }
 
@@ -193,21 +193,21 @@ namespace OpenSim.Region.Environment.Scenes
                             CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
                         AssetCache.AddAsset(asset);
 
-                        item.AssetID = asset.FullID;
+                        item.AssetID = asset.Metadata.FullID;
                         userInfo.UpdateItem(item);
 
                         // remoteClient.SendInventoryItemCreateUpdate(item);
-                        return (asset.FullID);
+                        return (asset.Metadata.FullID);
                     }
                 }
             }
             else
             {
                 m_log.ErrorFormat(
-                    "[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update", 
+                    "[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update",
                     remoteClient.AgentId);
-            }  
-            
+            }
+
             return UUID.Zero;
         }
 
@@ -283,9 +283,9 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 part.Inventory.RemoveScriptInstance(item.ItemID);
             }
-            
+
             // Update item with new asset
-            item.AssetID = asset.FullID;
+            item.AssetID = asset.Metadata.FullID;
             group.UpdateInventoryItem(item);
             part.GetProperties(remoteClient);
 
@@ -406,7 +406,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="recipientClient"></param>
         /// <param name="senderId">ID of the sender of the item</param>
-        /// <param name="itemId"></param>        
+        /// <param name="itemId"></param>
         public virtual void GiveInventoryItem(IClientAPI recipientClient, UUID senderId, UUID itemId)
         {
             InventoryItemBase itemCopy = GiveInventoryItem(recipientClient.AgentId, senderId, itemId);
@@ -420,19 +420,19 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="recipient"></param>
         /// <param name="senderId">ID of the sender of the item</param>
-        /// <param name="itemId"></param>        
+        /// <param name="itemId"></param>
         /// <returns>The inventory item copy given, null if the give was unsuccessful</returns>
         public virtual InventoryItemBase GiveInventoryItem(UUID recipient, UUID senderId, UUID itemId)
         {
             return GiveInventoryItem(recipient, senderId, itemId, UUID.Zero);
         }
-        
+
         /// <summary>
         /// Give an inventory item from one user to another
         /// </summary>
         /// <param name="recipient"></param>
         /// <param name="senderId">ID of the sender of the item</param>
-        /// <param name="itemId"></param>        
+        /// <param name="itemId"></param>
         /// <param name="recipientFolderId">
         /// The id of the folder in which the copy item should go.  If UUID.Zero then the item is placed in the most
         /// appropriate default folder.
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Environment.Scenes
                         itemCopy.AssetType = item.AssetType;
                         itemCopy.InvType = item.InvType;
                         itemCopy.Folder = recipientFolderId;
-                        
+
                         if (Permissions.PropagatePermissions())
                         {
                             if (item.InvType == 6)
@@ -557,19 +557,19 @@ namespace OpenSim.Region.Environment.Scenes
                 m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemId.ToString() + ", no root folder");
                 return null;
             }
-            
+
             return null;
         }
-        
+
         /// <summary>
-        /// Give an entire inventory folder from one user to another.  The entire contents (including all descendent 
+        /// Give an entire inventory folder from one user to another.  The entire contents (including all descendent
         /// folders) is given.
         /// </summary>
         /// <param name="recipientId"></param>
         /// <param name="senderId">ID of the sender of the item</param>
         /// <param name="folderId"></param>
         /// <param name="recipientParentFolderId">
-        /// The id of the receipient folder in which the send folder should be placed.  If UUID.Zero then the 
+        /// The id of the receipient folder in which the send folder should be placed.  If UUID.Zero then the
         /// recipient folder is the root folder
         /// </param>
         /// <returns>
@@ -588,24 +588,24 @@ namespace OpenSim.Region.Environment.Scenes
 
                 return null;
             }
-            
+
             if (!senderUserInfo.HasReceivedInventory)
             {
                 m_log.DebugFormat(
                      "[AGENT INVENTORY]: Could not give inventory folder - have not yet received inventory for {0}",
                      senderId);
-                
+
                 return null;
             }
-            
+
             InventoryFolderImpl folder = senderUserInfo.RootFolder.FindFolder(folderId);
-            
+
             if (null == folder)
             {
                 m_log.ErrorFormat(
                      "[AGENT INVENTORY]: Could not find inventory folder {0} to give", folderId);
 
-                return null;                
+                return null;
             }
 
             CachedUserInfo recipientUserInfo
@@ -618,30 +618,30 @@ namespace OpenSim.Region.Environment.Scenes
 
                 return null;
             }
-            
+
             if (recipientParentFolderId == UUID.Zero)
                 recipientParentFolderId = recipientUserInfo.RootFolder.ID;
-            
+
             UUID newFolderId = UUID.Random();
             recipientUserInfo.CreateFolder(folder.Name, newFolderId, (ushort)folder.Type, recipientParentFolderId);
-            
+
             // XXX: Messy - we should really get this back in the CreateFolder call
             InventoryFolderImpl copiedFolder = recipientUserInfo.RootFolder.FindFolder(newFolderId);
-            
+
             // Give all the subfolders
             List<InventoryFolderImpl> subFolders = folder.RequestListOfFolderImpls();
             foreach (InventoryFolderImpl childFolder in subFolders)
             {
                 GiveInventoryFolder(recipientId, senderId, childFolder.ID, copiedFolder.ID);
-            }              
-             
+            }
+
             // Give all the items
             List<InventoryItemBase> items = folder.RequestListOfItems();
             foreach (InventoryItemBase item in items)
             {
                 GiveInventoryItem(recipientId, senderId, item.ID, copiedFolder.ID);
             }
-            
+
             return copiedFolder;
         }
 
@@ -688,7 +688,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (newName != String.Empty)
                 {
-                    asset.Name = newName;
+                    asset.Metadata.Name = newName;
                 }
                 else
                 {
@@ -728,10 +728,10 @@ namespace OpenSim.Region.Environment.Scenes
         private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data)
         {
             AssetBase asset = new AssetBase();
-            asset.Name = name;
-            asset.Description = description;
-            asset.Type = assetType;
-            asset.FullID = UUID.Random();
+            asset.Metadata.Name = name;
+            asset.Metadata.Description = description;
+            asset.Metadata.Type = assetType;
+            asset.Metadata.FullID = UUID.Random();
             asset.Data = (data == null) ? new byte[1] : data;
 
             return asset;
@@ -831,11 +831,11 @@ namespace OpenSim.Region.Environment.Scenes
                 item.Owner = remoteClient.AgentId;
                 item.Creator = remoteClient.AgentId;
                 item.ID = UUID.Random();
-                item.AssetID = asset.FullID;
-                item.Description = asset.Description;
+                item.AssetID = asset.Metadata.FullID;
+                item.Description = asset.Metadata.Description;
                 item.Name = name;
                 item.Flags = flags;
-                item.AssetType = asset.Type;
+                item.AssetType = asset.Metadata.Type;
                 item.InvType = invType;
                 item.Folder = folderID;
                 item.CurrentPermissions = currentMask;
@@ -879,7 +879,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
                 return;
-                
+
             if (transactionID == UUID.Zero)
             {
                 CachedUserInfo userInfo
@@ -890,7 +890,7 @@ namespace OpenSim.Region.Environment.Scenes
                     ScenePresence presence;
                     TryGetAvatar(remoteClient.AgentId, out presence);
                     byte[] data = null;
-                    
+
                     if (invType == 3 && presence != null) // OpenMetaverse.asset.assettype.landmark = 3 - needs to be turned into an enum
                     {
                         Vector3 pos = presence.AbsolutePosition;
@@ -905,7 +905,7 @@ namespace OpenSim.Region.Environment.Scenes
                     AssetBase asset = CreateAsset(name, description, assetType, data);
                     AssetCache.AddAsset(asset);
 
-                    CreateNewInventoryItem(remoteClient, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
+                    CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
                 }
                 else
                 {
@@ -1429,7 +1429,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
                 else // Updating existing item with new perms etc
-                {                    
+                {
                     IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
                     if (agentTransactions != null)
                     {
@@ -1511,7 +1511,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
             else  // script has been rezzed directly into a prim's inventory
-            {                
+            {
                 SceneObjectPart part = GetSceneObjectPart(itemBase.Folder);
                 if (part == null)
                     return;
@@ -1521,10 +1521,10 @@ namespace OpenSim.Region.Environment.Scenes
 
                 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                     return;
-                
+
                 if (!Permissions.CanCreateObjectInventory(
-                    itemBase.InvType, part.UUID, remoteClient.AgentId))               
-                    return;             
+                    itemBase.InvType, part.UUID, remoteClient.AgentId))
+                    return;
 
                 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n}"));
                 AssetCache.AddAsset(asset);
@@ -1550,7 +1550,7 @@ namespace OpenSim.Region.Environment.Scenes
                 taskItem.Flags = itemBase.Flags;
                 taskItem.PermsGranter = UUID.Zero;
                 taskItem.PermsMask = 0;
-                taskItem.AssetID = asset.FullID;
+                taskItem.AssetID = asset.Metadata.FullID;
 
                 part.Inventory.AddInventoryItem(taskItem, false);
                 part.GetProperties(remoteClient);
@@ -1737,7 +1737,7 @@ namespace OpenSim.Region.Environment.Scenes
                             grp.UUID,
                             remoteClient.AgentId);
                     permissionToDelete = permissionToTake;
-                    
+
                     if (permissionToDelete)
                     {
                         AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
@@ -1794,8 +1794,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="action"></param>
         /// <param name="folderID"></param>
-        /// <param name="objectGroup"></param> 
-        /// <param name="remoteClient"> </param>        
+        /// <param name="objectGroup"></param>
+        /// <param name="remoteClient"> </param>
         public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
                 SceneObjectGroup objectGroup, IClientAPI remoteClient)
         {
@@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes
             //
             CachedUserInfo userInfo;
 
-            if (action == DeRezAction.Take || action == DeRezAction.TakeCopy || 
+            if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
                 action == DeRezAction.SaveToExistingUserInventoryItem)
             {
                 // Take or take copy require a taker
@@ -1850,25 +1850,25 @@ namespace OpenSim.Region.Environment.Scenes
                 //
 
                 InventoryFolderBase folder = null;
-                InventoryItemBase item = null;                
+                InventoryItemBase item = null;
 
                 if (DeRezAction.SaveToExistingUserInventoryItem == action)
                 {
                     item = userInfo.RootFolder.FindItem(
                             objectGroup.RootPart.FromUserInventoryItemID);
-                    
+
                     if (null == item)
                     {
                         m_log.DebugFormat(
-                            "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.", 
-                            objectGroup.Name, objectGroup.UUID);                        
+                            "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
+                            objectGroup.Name, objectGroup.UUID);
                         return UUID.Zero;
                     }
                 }
                 else
                 {
                     // Folder magic
-                    // 
+                    //
                     if (action == DeRezAction.Delete)
                     {
                         // Deleting someone else's item
@@ -1940,7 +1940,7 @@ namespace OpenSim.Region.Environment.Scenes
                     item.InvType = (int)InventoryType.Object;
                     item.Folder = folder.ID;
                     item.Owner = userInfo.UserProfile.ID;
-                    
+
                 }
 
                 AssetBase asset = CreateAsset(
@@ -1949,16 +1949,16 @@ namespace OpenSim.Region.Environment.Scenes
                     (sbyte)AssetType.Object,
                     Utils.StringToBytes(sceneObjectXml));
                 AssetCache.AddAsset(asset);
-                assetID = asset.FullID;
-                
+                assetID = asset.Metadata.FullID;
+
                 if (DeRezAction.SaveToExistingUserInventoryItem == action)
-                {                                   
-                    item.AssetID = asset.FullID;                    
+                {
+                    item.AssetID = asset.Metadata.FullID;
                     userInfo.UpdateItem(item);
                 }
                 else
                 {
-                    item.AssetID = asset.FullID;
+                    item.AssetID = asset.Metadata.FullID;
 
                     if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions())
                     {
@@ -1991,12 +1991,12 @@ namespace OpenSim.Region.Environment.Scenes
 
                     // TODO: add the new fields (Flags, Sale info, etc)
                     item.CreationDate = Util.UnixTimeSinceEpoch();
-                    item.Description = asset.Description;
-                    item.Name = asset.Name;
-                    item.AssetType = asset.Type;
+                    item.Description = asset.Metadata.Description;
+                    item.Name = asset.Metadata.Name;
+                    item.AssetType = asset.Metadata.Type;
 
                     userInfo.AddItem(item);
-                    
+
                     if (remoteClient != null && item.Owner == remoteClient.AgentId)
                     {
                         remoteClient.SendInventoryItemCreateUpdate(item);
@@ -2008,10 +2008,10 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item);
                         }
-                    }                    
+                    }
                 }
             }
-            
+
             return assetID;
         }
 
@@ -2025,11 +2025,11 @@ namespace OpenSim.Region.Environment.Scenes
                     m_log.InfoFormat("[ATTACHMENT]: Save request for {0} which is unchanged", grp.UUID);
                     return;
                 }
-                
+
                 m_log.InfoFormat(
-                    "[ATTACHMENT]: Updating asset for attachment {0}, attachpoint {1}", 
+                    "[ATTACHMENT]: Updating asset for attachment {0}, attachpoint {1}",
                     grp.UUID, grp.GetAttachmentPoint());
-                
+
                 string sceneObjectXml = objectGroup.ToXmlString();
 
                 CachedUserInfo userInfo =
@@ -2077,10 +2077,10 @@ namespace OpenSim.Region.Environment.Scenes
                             Utils.StringToBytes(sceneObjectXml));
                         AssetCache.AddAsset(asset);
 
-                        item.AssetID = asset.FullID;
-                        item.Description = asset.Description;
-                        item.Name = asset.Name;
-                        item.AssetType = asset.Type;
+                        item.AssetID = asset.Metadata.FullID;
+                        item.Description = asset.Metadata.Description;
+                        item.Name = asset.Metadata.Name;
+                        item.AssetType = asset.Metadata.Type;
                         item.InvType = (int)InventoryType.Object;
                         item.Folder = foundFolder;
 
@@ -2118,10 +2118,10 @@ namespace OpenSim.Region.Environment.Scenes
                     item.Creator = grp.RootPart.CreatorID;
                     item.Owner = remoteClient.AgentId;
                     item.ID = UUID.Random();
-                    item.AssetID = asset.FullID;
-                    item.Description = asset.Description;
-                    item.Name = asset.Name;
-                    item.AssetType = asset.Type;
+                    item.AssetID = asset.Metadata.FullID;
+                    item.Description = asset.Metadata.Description;
+                    item.Name = asset.Metadata.Name;
+                    item.AssetType = asset.Metadata.Type;
                     item.InvType = (int)InventoryType.Object;
 
                     item.Folder = UUID.Zero; // Objects folder!
@@ -2241,20 +2241,20 @@ namespace OpenSim.Region.Environment.Scenes
                         if (rezAsset != null)
                         {
                             UUID itemId = UUID.Zero;
-                            
+
                             // If we have permission to copy then link the rezzed object back to the user inventory
                             // item that it came from.  This allows us to enable 'save object to inventory'
                             if (!Permissions.BypassPermissions())
                             {
                                 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy)
-                                {       
+                                {
                                     itemId = item.ID;
                                 }
                             }
-                            
+
                             string xmlData = Utils.BytesToString(rezAsset.Data);
                             SceneObjectGroup group = new SceneObjectGroup(itemId, xmlData, true);
-                            
+
                             if (!Permissions.CanRezObject(
                                 group.Children.Count, remoteClient.AgentId, pos)
                                 && !attachment)
@@ -2351,12 +2351,12 @@ namespace OpenSim.Region.Environment.Scenes
                                     group.ClearPartAttachmentData();
                                 }
                             }
-                            
+
                             if (!attachment)
                             {
                                 // Fire on_rez
                                 group.CreateScriptInstances(0, true, DefaultScriptEngine, 0);
-                                
+
                                 rootPart.ScheduleFullUpdate();
                             }
 
@@ -2500,7 +2500,7 @@ namespace OpenSim.Region.Environment.Scenes
                 DeRezObject(null, grp.RootPart.LocalId,
                         grp.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
             }
-            
+
             return true;
         }
 
@@ -2632,7 +2632,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
 
             }
-            
+
             m_sceneGraph.DetachSingleAttachmentToInv(itemID, remoteClient);
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 33dae66..32bd9aa 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -115,18 +115,18 @@ namespace OpenSim.Region.Environment.Scenes
 
         /// <value>
         /// All the region modules attached to this scene.
-        /// </value>        
+        /// </value>
         public Dictionary<string, IRegionModule> Modules
         {
             get { return m_modules; }
         }
         protected Dictionary<string, IRegionModule> m_modules = new Dictionary<string, IRegionModule>();
-        
+
         /// <value>
         /// The module interfaces available from this scene.
         /// </value>
         protected Dictionary<Type, List<object> > ModuleInterfaces = new Dictionary<Type, List<object> >();
-        
+
         protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
         protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
 
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected IInterregionCommsIn m_interregionCommsIn;
         protected IDialogModule m_dialogModule;
         protected internal ICapabilitiesModule CapsModule;
-        
+
         // Central Update Loop
 
         protected int m_fps = 10;
@@ -280,10 +280,10 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         public int objectCapacity = 45000;
-        
+
         /// <value>
         /// Registered classes that are capable of creating entities.
-        /// </value>       
+        /// </value>
         protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
 
         #endregion
@@ -316,7 +316,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_eventManager = new EventManager();
             m_permissions = new ScenePermissions(this);
-            
+
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
             m_asyncSceneObjectDeleter.Enabled = true;
 
@@ -421,7 +421,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected virtual void RegisterDefaultSceneEvents()
         {
             IDialogModule dm = RequestModuleInterface<IDialogModule>();
-            
+
             if (dm != null)
                 m_eventManager.OnPermissionError += dm.SendAlertToUser;
         }
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Environment.Scenes
                 m_incrementsof15seconds = (int)seconds / 15;
                 m_RestartTimerCounter = 0;
                 m_restartTimer.AutoReset = true;
-                m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);                
+                m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
                 m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes");
                 m_restartTimer.Start();
                 m_dialogModule.SendNotificationToUsersInRegion(
@@ -583,8 +583,8 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
                     m_dialogModule.SendNotificationToUsersInRegion(
-                        UUID.Random(), 
-                        String.Empty, 
+                        UUID.Random(),
+                        String.Empty,
                         RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter) * 15) + " seconds");
             }
             else
@@ -717,7 +717,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             // Stop all client threads.
             ForEachScenePresence(delegate(ScenePresence avatar) { avatar.ControllingClient.Close(true); });
-            
+
             // Stop updating the scene objects and agents.
             //m_heartbeatTimer.Close();
             shuttingdown = true;
@@ -733,7 +733,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
             m_sceneGraph.Close();
-            
+
             // De-register with region communications (events cleanup)
             UnRegisterRegionWithComms();
 
@@ -1400,7 +1400,7 @@ namespace OpenSim.Region.Environment.Scenes
                     //tc = System.Environment.TickCount - tc;
                     //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
                 }
-                
+
                 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
 
                 bool drawPrimVolume = true;
@@ -1644,13 +1644,13 @@ namespace OpenSim.Region.Environment.Scenes
             m_regInfo.RegionSettings.TerrainImageID = TerrainImageUUID;
 
             AssetBase asset = new AssetBase();
-            asset.FullID = m_regInfo.RegionSettings.TerrainImageID;
+            asset.Metadata.FullID = m_regInfo.RegionSettings.TerrainImageID;
             asset.Data = data;
-            asset.Name = "terrainImage_" + m_regInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
-            asset.Description = RegionInfo.RegionName;
+            asset.Metadata.Name = "terrainImage_" + m_regInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
+            asset.Metadata.Description = RegionInfo.RegionName;
 
-            asset.Type = 0;
-            asset.Temporary = temporary;
+            asset.Metadata.Type = 0;
+            asset.Metadata.Temporary = temporary;
             AssetCache.AddAsset(asset);
         }
 
@@ -1699,7 +1699,7 @@ namespace OpenSim.Region.Environment.Scenes
                     m_log.ErrorFormat("[SCENE] Found a SceneObjectGroup with m_rootPart == null and {0} children",
                                       group.Children == null ? 0 : group.Children.Count);
                 }
-                
+
                 AddRestoredSceneObject(group, true, true);
                 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
                 rootPart.ObjectFlags &= ~(uint)PrimFlags.Scripted;
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             //m_log.DebugFormat(
             //    "[SCENE]: Scene.AddNewPrim() pcode {0} called for {1} in {2}", shape.PCode, ownerID, RegionInfo.RegionName);
-            
+
             // If an entity creator has been registered for this prim type then use that
             if (m_entityCreators.ContainsKey((PCode)shape.PCode))
                 return m_entityCreators[(PCode)shape.PCode].CreateEntity(ownerID, groupID, pos, rot, shape);
@@ -2094,7 +2094,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <returns></returns>
         public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod)
         {
-            
+
             if (XMLMethod == 0)
             {
                 m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID);
@@ -2308,7 +2308,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 CreateAndAddScenePresence(client);
             }
-            
+
             m_LastLogin = System.Environment.TickCount;
             EventManager.TriggerOnNewClient(client);
         }
@@ -2390,7 +2390,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnUnackedTerrain += TerrainUnAcked;
 
             client.OnObjectOwner += ObjectOwner;
-            
+
             if (StatsReporter != null)
                 client.OnNetworkStatsUpdate += StatsReporter.AddPacketsFromClientStats;
 
@@ -2561,7 +2561,7 @@ namespace OpenSim.Region.Environment.Scenes
                 m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}",
                     client.Name, e);
             }
-            
+
             m_log.Warn("[APPEARANCE]: Appearance not found, returning default");
         }
 
@@ -2770,21 +2770,21 @@ namespace OpenSim.Region.Environment.Scenes
 
             ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
             if (sp != null)
-            {                    
+            {
                 m_log.DebugFormat(
-                    "[SCENE]: Adjusting known seeds for existing agent {0} in {1}", 
+                    "[SCENE]: Adjusting known seeds for existing agent {0} in {1}",
                     agent.AgentID, RegionInfo.RegionName);
-                
+
                 sp.AdjustKnownSeeds();
-                
+
                 return;
             }
-            
+
             // Don't disable this log message - it's too helpful
             m_log.DebugFormat(
-                "[CONNECTION BEGIN]: Region {0} told of incoming client {1} {2} {3} (circuit code {4})", 
+                "[CONNECTION BEGIN]: Region {0} told of incoming client {1} {2} {3} (circuit code {4})",
                 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
-            
+
             if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
             {
                 m_log.WarnFormat(
@@ -2808,10 +2808,10 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
             m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
-            
+
             // rewrite session_id
             CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
-            
+
             if (userinfo != null)
             {
                 userinfo.SessionID = agent.SessionID;
@@ -2873,12 +2873,12 @@ namespace OpenSim.Region.Environment.Scenes
         public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
         {
             ScenePresence presence;
-            
+
             lock (m_scenePresences)
             {
                 m_scenePresences.TryGetValue(agentID, out presence);
             }
-            
+
             if (presence != null)
             {
                 try
@@ -2902,14 +2902,14 @@ namespace OpenSim.Region.Environment.Scenes
         {
 //            m_log.DebugFormat(
 //                "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
-            
+
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
                 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
                 return true;
             }
-            
+
             return false;
         }
 
@@ -2932,10 +2932,10 @@ namespace OpenSim.Region.Environment.Scenes
                     // Not Implemented:
                     //TODO: Do we need to pass the message on to one of our neighbors?
                 }
-                
+
                 return true;
             }
-            
+
             return false;
         }
 
@@ -2957,7 +2957,7 @@ namespace OpenSim.Region.Environment.Scenes
         public bool IncomingCloseAgent(UUID agentID)
         {
             //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
-            
+
             ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
             if (presence != null)
             {
@@ -2972,7 +2972,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
 
                 // Don't do this to root agents on logout, it's not nice for the viewer
-                if (presence.IsChildAgent) 
+                if (presence.IsChildAgent)
                 {
                     // Tell a single agent to disconnect from the region.
                     IEventQueue eq = RequestModuleInterface<IEventQueue>();
@@ -2984,11 +2984,11 @@ namespace OpenSim.Region.Environment.Scenes
                     else
                         presence.ControllingClient.SendShutdownConnectionNotice();
                 }
-                
+
                 presence.ControllingClient.Close(true);
                 return true;
             }
-            
+
             // Agent not here
             return false;
         }
@@ -3059,7 +3059,7 @@ namespace OpenSim.Region.Environment.Scenes
                 remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found.");
                 return;
             }
-            
+
             RequestTeleportLocation(remoteClient, regionInfo.RegionHandle, position, lookat, teleportFlags);
         }
 
@@ -3080,7 +3080,7 @@ namespace OpenSim.Region.Environment.Scenes
                 if (m_scenePresences.ContainsKey(remoteClient.AgentId))
                     sp = m_scenePresences[remoteClient.AgentId];
             }
-            
+
             if (sp != null)
             {
                 m_sceneGridService.RequestTeleportToLocation(sp, regionHandle,
@@ -3211,7 +3211,7 @@ namespace OpenSim.Region.Environment.Scenes
                 return;
 
             l.Add(mod);
-            
+
             if (mod is IEntityCreator)
             {
                 IEntityCreator entityCreator = (IEntityCreator)mod;
@@ -3220,7 +3220,7 @@ namespace OpenSim.Region.Environment.Scenes
                     m_entityCreators[pcode] = entityCreator;
                 }
             }
-            
+
             ModuleInterfaces[typeof(M)] = l;
         }
 
@@ -3243,7 +3243,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// For the given interface, retrieve an array of region modules that implement it.
         /// </summary>
-        /// <returns>an empty array if there are no registered modules implementing that interface</returns>        
+        /// <returns>an empty array if there are no registered modules implementing that interface</returns>
         public override T[] RequestModuleInterfaces<T>()
         {
             if (ModuleInterfaces.ContainsKey(typeof(T)))
@@ -3383,7 +3383,7 @@ namespace OpenSim.Region.Environment.Scenes
                 else
                 {
                     m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied");
-                }         
+                }
             }
         }
 
@@ -3855,14 +3855,14 @@ namespace OpenSim.Region.Environment.Scenes
         public override bool PresenceChildStatus(UUID avatarID)
         {
             ScenePresence cp = GetScenePresence(avatarID);
-            
+
             // FIXME: This is really crap - some logout code is relying on a NullReferenceException to halt its processing
             // This needs to be fixed properly by cleaning up the logout code.
             //if (cp != null)
             //    return cp.IsChildAgent;
-            
+
             //return false;
-            
+
             return cp.IsChildAgent;
         }
 
@@ -4140,10 +4140,10 @@ namespace OpenSim.Region.Environment.Scenes
 
                     item.ID = UUID.Random();
                     item.Owner = remoteClient.AgentId;
-                    item.AssetID = asset.FullID;
-                    item.Description = asset.Description;
-                    item.Name = asset.Name;
-                    item.AssetType = asset.Type;
+                    item.AssetID = asset.Metadata.FullID;
+                    item.Description = asset.Metadata.Description;
+                    item.Name = asset.Metadata.Name;
+                    item.AssetType = asset.Metadata.Type;
                     item.InvType = (int)InventoryType.Object;
                     item.Folder = categoryID;
 
@@ -4194,7 +4194,7 @@ namespace OpenSim.Region.Environment.Scenes
                 if (!okToSell)
                 {
                     m_dialogModule.SendAlertToUser(
-                        remoteClient, "This item's inventory doesn't appear to be for sale");                 
+                        remoteClient, "This item's inventory doesn't appear to be for sale");
                     return false;
                 }
 
@@ -4252,7 +4252,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         // This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene
         // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called
-        // from within the OdePhysicsScene. 
+        // from within the OdePhysicsScene.
 
         protected internal void jointMoved(PhysicsJoint joint)
         {
@@ -4348,7 +4348,7 @@ namespace OpenSim.Region.Environment.Scenes
             // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary
             if (joint != null)
             {
-                if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages) 
+                if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages)
                     return;
 
                 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);