aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index eefcfe8..94140fc 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -32,6 +32,7 @@ using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces;
35 36
36namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 37namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
37{ 38{
@@ -177,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
177 asset.Type = (sbyte)item.Type; 178 asset.Type = (sbyte)item.Type;
178 item.AssetID = asset.FullID; 179 item.AssetID = asset.FullID;
179 180
180 Manager.MyScene.CommsManager.AssetCache.AddAsset(asset); 181 Manager.MyScene.AssetService.Store(asset);
181 182
182 if (part.Inventory.UpdateInventoryItem(item)) 183 if (part.Inventory.UpdateInventoryItem(item))
183 part.GetProperties(remoteClient); 184 part.GetProperties(remoteClient);
@@ -198,9 +199,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
198 { 199 {
199 UUID assetID = UUID.Combine(transactionID, remoteClient.SecureSessionId); 200 UUID assetID = UUID.Combine(transactionID, remoteClient.SecureSessionId);
200 201
201 AssetBase asset 202 AssetBase asset = Manager.MyScene.AssetService.Get(assetID.ToString());
202 = Manager.MyScene.CommsManager.AssetCache.GetAsset(
203 assetID, (item.AssetType == (int)AssetType.Texture ? true : false));
204 203
205 if (asset == null) 204 if (asset == null)
206 { 205 {
@@ -216,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
216 asset.Type = (sbyte)item.AssetType; 215 asset.Type = (sbyte)item.AssetType;
217 item.AssetID = asset.FullID; 216 item.AssetID = asset.FullID;
218 217
219 Manager.MyScene.CommsManager.AssetCache.AddAsset(asset); 218 Manager.MyScene.AssetService.Store(asset);
220 } 219 }
221 220
222 userInfo.UpdateItem(item); 221 userInfo.UpdateItem(item);