diff options
Deleted old inventoryCache.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs index a785eff..6a05ba2 100644 --- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs +++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs | |||
@@ -29,7 +29,6 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using libsecondlife.Packets; | 31 | using libsecondlife.Packets; |
32 | using OpenSim.Assets; | ||
33 | using OpenSim.Framework.Interfaces; | 32 | using OpenSim.Framework.Interfaces; |
34 | using OpenSim.Framework.Types; | 33 | using OpenSim.Framework.Types; |
35 | using OpenSim.Framework.Utilities; | 34 | using OpenSim.Framework.Utilities; |
@@ -45,13 +44,13 @@ namespace OpenSim.Region.ClientStack | |||
45 | private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>(); | 44 | private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>(); |
46 | private ClientView ourClient; | 45 | private ClientView ourClient; |
47 | private AssetCache m_assetCache; | 46 | private AssetCache m_assetCache; |
48 | private InventoryCache m_inventoryCache; | 47 | // private InventoryCache m_inventoryCache; |
49 | 48 | ||
50 | public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache) | 49 | public AgentAssetUpload(ClientView client, AssetCache assetCache ) |
51 | { | 50 | { |
52 | this.ourClient = client; | 51 | this.ourClient = client; |
53 | m_assetCache = assetCache; | 52 | m_assetCache = assetCache; |
54 | m_inventoryCache = inventoryCache; | 53 | // m_inventoryCache = inventoryCache; |
55 | } | 54 | } |
56 | 55 | ||
57 | public void AddUpload(LLUUID transactionID, AssetBase asset) | 56 | public void AddUpload(LLUUID transactionID, AssetBase asset) |
@@ -187,7 +186,7 @@ namespace OpenSim.Region.ClientStack | |||
187 | if (trans.AddToInventory) | 186 | if (trans.AddToInventory) |
188 | { | 187 | { |
189 | // m_assetCache.AddAsset(trans.Asset); | 188 | // m_assetCache.AddAsset(trans.Asset); |
190 | m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); | 189 | //m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); |
191 | } | 190 | } |
192 | 191 | ||
193 | 192 | ||
@@ -235,7 +234,7 @@ namespace OpenSim.Region.ClientStack | |||
235 | { | 234 | { |
236 | //already complete so we can add it to the inventory | 235 | //already complete so we can add it to the inventory |
237 | //m_assetCache.AddAsset(trans.Asset); | 236 | //m_assetCache.AddAsset(trans.Asset); |
238 | m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset); | 237 | // m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset); |
239 | } | 238 | } |
240 | else | 239 | else |
241 | { | 240 | { |