diff options
| author | Melanie | 2011-05-08 20:23:06 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:23:06 +0100 |
| commit | b451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch) | |
| tree | c9fbe41be36cf791976f9e5afabd44f69b64e747 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2 opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 5b7a297..dfb5846 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -698,7 +698,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 698 | newName = item.Name; | 698 | newName = item.Name; |
| 699 | } | 699 | } |
| 700 | 700 | ||
| 701 | if (remoteClient.AgentId == oldAgentID) | 701 | if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner)) |
| 702 | { | 702 | { |
| 703 | CreateNewInventoryItem( | 703 | CreateNewInventoryItem( |
| 704 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, | 704 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, |