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 --- .../AssetTransaction/AgentAssetsTransactions.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs') diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 0bf91e0..eefcfe8 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -172,10 +172,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction "[ASSET TRANSACTIONS]: Updating task item {0} in {1} with asset in transaction {2}", item.Name, part.Name, transactionID); - asset.Metadata.Name = item.Name; - asset.Metadata.Description = item.Description; - asset.Metadata.Type = (sbyte)item.Type; - item.AssetID = asset.Metadata.FullID; + asset.Name = item.Name; + asset.Description = item.Description; + asset.Type = (sbyte)item.Type; + item.AssetID = asset.FullID; Manager.MyScene.CommsManager.AssetCache.AddAsset(asset); @@ -207,14 +207,14 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction asset = GetTransactionAsset(transactionID); } - if (asset != null && asset.Metadata.FullID == assetID) + if (asset != null && asset.FullID == assetID) { // Assets never get updated, new ones get created - asset.Metadata.FullID = UUID.Random(); - asset.Metadata.Name = item.Name; - asset.Metadata.Description = item.Description; - asset.Metadata.Type = (sbyte)item.AssetType; - item.AssetID = asset.Metadata.FullID; + asset.FullID = UUID.Random(); + asset.Name = item.Name; + asset.Description = item.Description; + asset.Type = (sbyte)item.AssetType; + item.AssetID = asset.FullID; Manager.MyScene.CommsManager.AssetCache.AddAsset(asset); } -- cgit v1.1