aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorMike Mazur2009-02-17 01:36:44 +0000
committerMike Mazur2009-02-17 01:36:44 +0000
commit76c0935ec744f2d230489398f879eb7f42b11d37 (patch)
treea68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Framework/Communications/Capabilities
parentMajor change to how appearance is managed, including changes in login and use... (diff)
downloadopensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.zip
opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.gz
opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.bz2
opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.xz
- 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
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs8
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
740 740
741 AssetBase asset; 741 AssetBase asset;
742 asset = new AssetBase(); 742 asset = new AssetBase();
743 asset.Metadata.FullID = assetID; 743 asset.FullID = assetID;
744 asset.Metadata.Type = assType; 744 asset.Type = assType;
745 asset.Metadata.Name = assetName; 745 asset.Name = assetName;
746 asset.Data = data; 746 asset.Data = data;
747 m_assetCache.AddAsset(asset); 747 m_assetCache.AddAsset(asset);
748 748
@@ -750,7 +750,7 @@ namespace OpenSim.Framework.Communications.Capabilities
750 item.Owner = m_agentID; 750 item.Owner = m_agentID;
751 item.Creator = m_agentID; 751 item.Creator = m_agentID;
752 item.ID = inventoryItem; 752 item.ID = inventoryItem;
753 item.AssetID = asset.Metadata.FullID; 753 item.AssetID = asset.FullID;
754 item.Description = assetDescription; 754 item.Description = assetDescription;
755 item.Name = assetName; 755 item.Name = assetName;
756 item.AssetType = assType; 756 item.AssetType = assType;