aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
diff options
context:
space:
mode:
authorDiva Canto2011-04-15 16:42:40 -0700
committerDiva Canto2011-04-15 16:42:40 -0700
commitcd6dce11086a4e8a06257659c19eaa66d3b1a951 (patch)
treeeb6e8b25f925e46cf41b5e9a386e40a3fa8ddfd2 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
parentMake remote admin error messages more helpful on windows. (diff)
downloadopensim-SC_OLD-cd6dce11086a4e8a06257659c19eaa66d3b1a951.zip
opensim-SC_OLD-cd6dce11086a4e8a06257659c19eaa66d3b1a951.tar.gz
opensim-SC_OLD-cd6dce11086a4e8a06257659c19eaa66d3b1a951.tar.bz2
opensim-SC_OLD-cd6dce11086a4e8a06257659c19eaa66d3b1a951.tar.xz
Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't).
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 8b68dbe..a716326 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -330,11 +330,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
330 } 330 }
331 } 331 }
332 } 332 }
333
334 // This is a hook to do some per-asset post-processing for subclasses that need that
335 ExportAsset(remoteClient.AgentId, assetID);
333 } 336 }
334 337
335 return assetID; 338 return assetID;
336 } 339 }
337 340
341 protected virtual void ExportAsset(UUID agentID, UUID assetID)
342 {
343 // nothing to do here
344 }
345
338 /// <summary> 346 /// <summary>
339 /// Add relevant permissions for an object to the item. 347 /// Add relevant permissions for an object to the item.
340 /// </summary> 348 /// </summary>