aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-09 20:07:15 +0000
committerJustin Clarke Casey2008-12-09 20:07:15 +0000
commitdae84498ed4bfebd4b912939a1c2d32c05187416 (patch)
treea0ef8fa2c6581093f11ae69cba608afdb4fadbec /OpenSim/Region
parent* Actually update subfolders of parent folders in the inventory cache when a ... (diff)
downloadopensim-SC-dae84498ed4bfebd4b912939a1c2d32c05187416.zip
opensim-SC-dae84498ed4bfebd4b912939a1c2d32c05187416.tar.gz
opensim-SC-dae84498ed4bfebd4b912939a1c2d32c05187416.tar.bz2
opensim-SC-dae84498ed4bfebd4b912939a1c2d32c05187416.tar.xz
* Enable agent to agent transfer of inventory folders
* It should now be possible to give an entire folder to another avatar instead of just single items at a time
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 4a7f336..0e3634c 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -144,11 +144,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
144 // First byte is the asset type 144 // First byte is the asset type
145 AssetType assetType = (AssetType)im.binaryBucket[0]; 145 AssetType assetType = (AssetType)im.binaryBucket[0];
146 146
147 // Temporarily disabled pending test of complex transfers (folders within folders, lots of items,
148 // empty folders, etc.)
149 if (AssetType.Folder == assetType)
150 return;
151
152 if (AssetType.Folder == assetType) 147 if (AssetType.Folder == assetType)
153 { 148 {
154 UUID folderID = new UUID(im.binaryBucket, 1); 149 UUID folderID = new UUID(im.binaryBucket, 1);