diff options
author | Melanie | 2010-01-04 21:41:33 +0000 |
---|---|---|
committer | Melanie | 2010-01-04 21:41:33 +0000 |
commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
parent | Finish conversion if XInventoryService (diff) | |
download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index f322af3..a14c853 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2054,6 +2054,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2054 | group.Children.Count, remoteClient.AgentId, pos) | 2054 | group.Children.Count, remoteClient.AgentId, pos) |
2055 | && !attachment) | 2055 | && !attachment) |
2056 | { | 2056 | { |
2057 | // The client operates in no fail mode. It will | ||
2058 | // have already removed the item from the folder | ||
2059 | // if it's no copy. | ||
2060 | // Put it back if it's not an attachment | ||
2061 | // | ||
2062 | if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment)) | ||
2063 | remoteClient.SendBulkUpdateInventory(item); | ||
2057 | return null; | 2064 | return null; |
2058 | } | 2065 | } |
2059 | 2066 | ||