diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index a77bc63..5a9efb8 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -695,18 +695,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
695 | if (remoteClient == null || | 695 | if (remoteClient == null || |
696 | so.OwnerID != remoteClient.AgentId) | 696 | so.OwnerID != remoteClient.AgentId) |
697 | { | 697 | { |
698 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); | 698 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound); |
699 | } | 699 | } |
700 | else | 700 | else |
701 | { | 701 | { |
702 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder); | 702 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Trash); |
703 | } | 703 | } |
704 | } | 704 | } |
705 | else if (action == DeRezAction.Return) | 705 | else if (action == DeRezAction.Return) |
706 | { | 706 | { |
707 | // Dump to lost + found unconditionally | 707 | // Dump to lost + found unconditionally |
708 | // | 708 | // |
709 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); | 709 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound); |
710 | } | 710 | } |
711 | 711 | ||
712 | if (folderID == UUID.Zero && folder == null) | 712 | if (folderID == UUID.Zero && folder == null) |
@@ -715,7 +715,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
715 | { | 715 | { |
716 | // Deletes go to trash by default | 716 | // Deletes go to trash by default |
717 | // | 717 | // |
718 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder); | 718 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Trash); |
719 | } | 719 | } |
720 | else | 720 | else |
721 | { | 721 | { |
@@ -723,14 +723,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
723 | { | 723 | { |
724 | // Taking copy of another person's item. Take to | 724 | // Taking copy of another person's item. Take to |
725 | // Objects folder. | 725 | // Objects folder. |
726 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object); | 726 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Object); |
727 | so.FromFolderID = UUID.Zero; | 727 | so.FromFolderID = UUID.Zero; |
728 | } | 728 | } |
729 | else | 729 | else |
730 | { | 730 | { |
731 | // Catch all. Use lost & found | 731 | // Catch all. Use lost & found |
732 | // | 732 | // |
733 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); | 733 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound); |
734 | } | 734 | } |
735 | } | 735 | } |
736 | } | 736 | } |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
748 | if(folder.Type == 14 || folder.Type == 16) | 748 | if(folder.Type == 14 || folder.Type == 16) |
749 | { | 749 | { |
750 | // folder.Type = 6; | 750 | // folder.Type = 6; |
751 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object); | 751 | folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.Object); |
752 | } | 752 | } |
753 | } | 753 | } |
754 | } | 754 | } |