From 76c0935ec744f2d230489398f879eb7f42b11d37 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Tue, 17 Feb 2009 01:36:44 +0000
Subject: - 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

---
 .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e4ef236..eeef58b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1025,10 +1025,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // Create new asset
             AssetBase asset = new AssetBase();
-            asset.Metadata.Name = notecardName;
-            asset.Metadata.Description = "Script Generated Notecard";
-            asset.Metadata.Type = 7;
-            asset.Metadata.FullID = UUID.Random();
+            asset.Name = notecardName;
+            asset.Description = "Script Generated Notecard";
+            asset.Type = 7;
+            asset.FullID = UUID.Random();
             string notecardData = "";
 
             for (int i = 0; i < contents.Length; i++) {
@@ -1048,8 +1048,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             taskItem.ResetIDs(m_host.UUID);
             taskItem.ParentID = m_host.UUID;
             taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
-            taskItem.Name = asset.Metadata.Name;
-            taskItem.Description = asset.Metadata.Description;
+            taskItem.Name = asset.Name;
+            taskItem.Description = asset.Description;
             taskItem.Type = 7;
             taskItem.InvType = 7;
             taskItem.OwnerID = m_host.OwnerID;
@@ -1063,7 +1063,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             taskItem.Flags = 0;
             taskItem.PermsGranter = UUID.Zero;
             taskItem.PermsMask = 0;
-            taskItem.AssetID = asset.Metadata.FullID;
+            taskItem.AssetID = asset.FullID;
 
             m_host.Inventory.AddInventoryItem(taskItem, false);
         }
-- 
cgit v1.1