diff options
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalInventoryService.cs')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalInventoryService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 5d450bb..fd6002a 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -29,8 +29,8 @@ | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework.Communications; | 31 | using OpenSim.Framework.Communications; |
32 | using OpenSim.Framework.Communications.Cache; | ||
32 | using OpenSim.Framework.Types; | 33 | using OpenSim.Framework.Types; |
33 | using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; | ||
34 | 34 | ||
35 | namespace OpenSim.Region.Communications.Local | 35 | namespace OpenSim.Region.Communications.Local |
36 | { | 36 | { |
@@ -45,14 +45,14 @@ namespace OpenSim.Region.Communications.Local | |||
45 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) | 45 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) |
46 | { | 46 | { |
47 | List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); | 47 | List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); |
48 | InventoryFolder rootFolder = null; | 48 | InventoryFolderImpl rootFolder = null; |
49 | 49 | ||
50 | //need to make sure we send root folder first | 50 | //need to make sure we send root folder first |
51 | foreach (InventoryFolderBase folder in folders) | 51 | foreach (InventoryFolderBase folder in folders) |
52 | { | 52 | { |
53 | if (folder.parentID == libsecondlife.LLUUID.Zero) | 53 | if (folder.parentID == libsecondlife.LLUUID.Zero) |
54 | { | 54 | { |
55 | InventoryFolder newfolder = new InventoryFolder(folder); | 55 | InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); |
56 | rootFolder = newfolder; | 56 | rootFolder = newfolder; |
57 | folderCallBack(userID, newfolder); | 57 | folderCallBack(userID, newfolder); |
58 | } | 58 | } |
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Communications.Local | |||
64 | { | 64 | { |
65 | if (folder.folderID != rootFolder.folderID) | 65 | if (folder.folderID != rootFolder.folderID) |
66 | { | 66 | { |
67 | InventoryFolder newfolder = new InventoryFolder(folder); | 67 | InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); |
68 | folderCallBack(userID, newfolder); | 68 | folderCallBack(userID, newfolder); |
69 | 69 | ||
70 | List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); | 70 | List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); |
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Communications.Local | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) | 80 | public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder) |
81 | { | 81 | { |
82 | this.AddFolder(folder); | 82 | this.AddFolder(folder); |
83 | } | 83 | } |