- remove the Metadata property from AssetBase and return all previous

  properties as before
- prefix private variables with m_ in AssetBase.cs
- related to Mantis #3122, as mentioned in
  https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html
- all services will likely need to be upgraded after this commit

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index b68083e..a4c847d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -740,9 +740,9 @@ namespace OpenSim.Framework.Communications.Capabilities
 
             AssetBase asset;
             asset = new AssetBase();
-            asset.Metadata.FullID = assetID;
-            asset.Metadata.Type = assType;
-            asset.Metadata.Name = assetName;
+            asset.FullID = assetID;
+            asset.Type = assType;
+            asset.Name = assetName;
             asset.Data = data;
             m_assetCache.AddAsset(asset);
 
@@ -750,7 +750,7 @@ namespace OpenSim.Framework.Communications.Capabilities
             item.Owner = m_agentID;
             item.Creator = m_agentID;
             item.ID = inventoryItem;
-            item.AssetID = asset.Metadata.FullID;
+            item.AssetID = asset.FullID;
             item.Description = assetDescription;
             item.Name = assetName;
             item.AssetType = assType;