aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
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/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
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/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 283a0cf..71570da 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -253,6 +253,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
253 return newAssetID; 253 return newAssetID;
254 } 254 }
255 255
256 ///
257 /// UpdateInventoryItemAsset
258 ///
259 public override bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
260 {
261 if (base.UpdateInventoryItemAsset(ownerID, item, asset))
262 {
263 UploadInventoryItem(ownerID, (AssetType)asset.Type, asset.FullID, asset.Name, 0);
264 return true;
265 }
266
267 return false;
268 }
269
256 /// 270 ///
257 /// Used in DeleteToInventory 271 /// Used in DeleteToInventory
258 /// 272 ///