aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2014-05-22 10:16:01 -0700
committerDiva Canto2014-05-22 10:16:01 -0700
commitf7b2aa0f49f5eca0a58c20b903103d19742220e9 (patch)
treebbb85d7ec857b4f98ea66ca2ba33e4076f7f51c3 /OpenSim/Region/Framework
parentDon't trigger ItemUploaded when no item has been uploaded. (diff)
downloadopensim-SC_OLD-f7b2aa0f49f5eca0a58c20b903103d19742220e9.zip
opensim-SC_OLD-f7b2aa0f49f5eca0a58c20b903103d19742220e9.tar.gz
opensim-SC_OLD-f7b2aa0f49f5eca0a58c20b903103d19742220e9.tar.bz2
opensim-SC_OLD-f7b2aa0f49f5eca0a58c20b903103d19742220e9.tar.xz
Fixed a problem with detaching attachments in situations where the user's asset server is not the same as the simulator's asset server. Unfortunately this still continues to be wasteful -- new assets are created every time an attachment is detached, but the process of storing the new asset goes through the InventoryAccess module, which does all sorts of checks regarding the users' inventory.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
index 3576e35..6bad018 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
@@ -38,7 +38,9 @@ namespace OpenSim.Region.Framework.Interfaces
38 public interface IInventoryAccessModule 38 public interface IInventoryAccessModule
39 { 39 {
40 UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data); 40 UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data);
41 41
42 bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset);
43
42 /// <summary> 44 /// <summary>
43 /// Copy objects to a user's inventory. 45 /// Copy objects to a user's inventory.
44 /// </summary> 46 /// </summary>