diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index c83454e..8c1a628 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1100,8 +1100,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1100 | if (objectID == UUID.Zero) // User inventory | 1100 | if (objectID == UUID.Zero) // User inventory |
| 1101 | { | 1101 | { |
| 1102 | IInventoryService invService = m_scene.InventoryService; | 1102 | IInventoryService invService = m_scene.InventoryService; |
| 1103 | InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user); | 1103 | InventoryItemBase assetRequestItem = invService.GetItem(user, notecard); |
| 1104 | assetRequestItem = invService.GetItem(assetRequestItem); | ||
| 1105 | if (assetRequestItem == null && LibraryRootFolder != null) // Library item | 1104 | if (assetRequestItem == null && LibraryRootFolder != null) // Library item |
| 1106 | { | 1105 | { |
| 1107 | assetRequestItem = LibraryRootFolder.FindItem(notecard); | 1106 | assetRequestItem = LibraryRootFolder.FindItem(notecard); |
| @@ -1625,8 +1624,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1625 | if (objectID == UUID.Zero) // User inventory | 1624 | if (objectID == UUID.Zero) // User inventory |
| 1626 | { | 1625 | { |
| 1627 | IInventoryService invService = m_scene.InventoryService; | 1626 | IInventoryService invService = m_scene.InventoryService; |
| 1628 | InventoryItemBase assetRequestItem = new InventoryItemBase(script, user); | 1627 | InventoryItemBase assetRequestItem = invService.GetItem(user, script); |
| 1629 | assetRequestItem = invService.GetItem(assetRequestItem); | ||
| 1630 | if (assetRequestItem == null && LibraryRootFolder != null) // Library item | 1628 | if (assetRequestItem == null && LibraryRootFolder != null) // Library item |
| 1631 | { | 1629 | { |
| 1632 | assetRequestItem = LibraryRootFolder.FindItem(script); | 1630 | assetRequestItem = LibraryRootFolder.FindItem(script); |
| @@ -1722,8 +1720,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1722 | if (objectID == UUID.Zero) // User inventory | 1720 | if (objectID == UUID.Zero) // User inventory |
| 1723 | { | 1721 | { |
| 1724 | IInventoryService invService = m_scene.InventoryService; | 1722 | IInventoryService invService = m_scene.InventoryService; |
| 1725 | InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user); | 1723 | InventoryItemBase assetRequestItem = invService.GetItem(user, notecard); |
| 1726 | assetRequestItem = invService.GetItem(assetRequestItem); | ||
| 1727 | if (assetRequestItem == null && LibraryRootFolder != null) // Library item | 1724 | if (assetRequestItem == null && LibraryRootFolder != null) // Library item |
| 1728 | { | 1725 | { |
| 1729 | assetRequestItem = LibraryRootFolder.FindItem(notecard); | 1726 | assetRequestItem = LibraryRootFolder.FindItem(notecard); |