diff options
| author | Melanie | 2011-05-08 20:20:40 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:20:40 +0100 |
| commit | 1be67914fab348115faa1fc9e9ecffbf7c303093 (patch) | |
| tree | 7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Mantis #5472 (diff) | |
| download | opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2 opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -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 b0f0de6..cd01a05 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -713,7 +713,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 713 | newName = item.Name; | 713 | newName = item.Name; |
| 714 | } | 714 | } |
| 715 | 715 | ||
| 716 | if (remoteClient.AgentId == oldAgentID) | 716 | if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner)) |
| 717 | { | 717 | { |
| 718 | CreateNewInventoryItem( | 718 | CreateNewInventoryItem( |
| 719 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, | 719 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, |