diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 4dd89d2..8171487 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -654,9 +654,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
654 | // | 654 | // |
655 | if (action == DeRezAction.Take || action == DeRezAction.TakeCopy) | 655 | if (action == DeRezAction.Take || action == DeRezAction.TakeCopy) |
656 | { | 656 | { |
657 | if (so.RootPart.FromFolderID != UUID.Zero && userID == remoteClient.AgentId) | 657 | if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId) |
658 | { | 658 | { |
659 | InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID); | 659 | InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID); |
660 | folder = m_Scene.InventoryService.GetFolder(f); | 660 | folder = m_Scene.InventoryService.GetFolder(f); |
661 | } | 661 | } |
662 | } | 662 | } |
@@ -962,7 +962,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
962 | rootPart.SalePrice = item.SalePrice; | 962 | rootPart.SalePrice = item.SalePrice; |
963 | } | 963 | } |
964 | 964 | ||
965 | rootPart.FromFolderID = item.Folder; | 965 | so.FromFolderID = item.Folder; |
966 | 966 | ||
967 | // Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}", | 967 | // Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}", |
968 | // rootPart.OwnerID, item.Owner, item.CurrentPermissions); | 968 | // rootPart.OwnerID, item.Owner, item.CurrentPermissions); |
@@ -1008,7 +1008,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
1008 | rootPart.TrimPermissions(); | 1008 | rootPart.TrimPermissions(); |
1009 | 1009 | ||
1010 | if (isAttachment) | 1010 | if (isAttachment) |
1011 | so.SetFromItemID(item.ID); | 1011 | so.FromItemID = item.ID; |
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | return true; | 1014 | return true; |