diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/InventoryFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolder.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs index fbe1bd0..af3346f 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |||
@@ -35,15 +35,15 @@ using OpenSim.Framework.Interfaces; | |||
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Utilities; | 36 | using OpenSim.Framework.Utilities; |
37 | 37 | ||
38 | namespace OpenSim.Framework.Communications.Caches | 38 | namespace OpenSim.Framework.Communications.Cache |
39 | { | 39 | { |
40 | public class InventoryFolder : InventoryFolderBase | 40 | public class InventoryFolderImpl : InventoryFolderBase |
41 | { | 41 | { |
42 | // Fields | 42 | // Fields |
43 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); | 43 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); |
44 | public Dictionary<LLUUID, InventoryFolder> SubFolders = new Dictionary<LLUUID, InventoryFolder>(); | 44 | public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); |
45 | 45 | ||
46 | public InventoryFolder(InventoryFolderBase folderbase) | 46 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
47 | { | 47 | { |
48 | this.agentID = folderbase.agentID; | 48 | this.agentID = folderbase.agentID; |
49 | this.folderID = folderbase.folderID; | 49 | this.folderID = folderbase.folderID; |
@@ -53,15 +53,15 @@ namespace OpenSim.Framework.Communications.Caches | |||
53 | this.version = folderbase.version; | 53 | this.version = folderbase.version; |
54 | } | 54 | } |
55 | 55 | ||
56 | public InventoryFolder() | 56 | public InventoryFolderImpl() |
57 | { | 57 | { |
58 | 58 | ||
59 | } | 59 | } |
60 | 60 | ||
61 | // Methods | 61 | // Methods |
62 | public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) | 62 | public InventoryFolderImpl CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) |
63 | { | 63 | { |
64 | InventoryFolder subFold = new InventoryFolder(); | 64 | InventoryFolderImpl subFold = new InventoryFolderImpl(); |
65 | subFold.name = folderName; | 65 | subFold.name = folderName; |
66 | subFold.folderID = folderID; | 66 | subFold.folderID = folderID; |
67 | subFold.type = (short) type; | 67 | subFold.type = (short) type; |
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
78 | { | 78 | { |
79 | return this.Items[itemID]; | 79 | return this.Items[itemID]; |
80 | } | 80 | } |
81 | foreach (InventoryFolder folder in this.SubFolders.Values) | 81 | foreach (InventoryFolderImpl folder in this.SubFolders.Values) |
82 | { | 82 | { |
83 | base2 = folder.HasItem(itemID); | 83 | base2 = folder.HasItem(itemID); |
84 | if (base2 != null) | 84 | if (base2 != null) |
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
97 | Items.Remove(itemID); | 97 | Items.Remove(itemID); |
98 | return true; | 98 | return true; |
99 | } | 99 | } |
100 | foreach (InventoryFolder folder in this.SubFolders.Values) | 100 | foreach (InventoryFolderImpl folder in this.SubFolders.Values) |
101 | { | 101 | { |
102 | found = folder.DeleteItem(itemID); | 102 | found = folder.DeleteItem(itemID); |
103 | if (found == true) | 103 | if (found == true) |
@@ -109,16 +109,16 @@ namespace OpenSim.Framework.Communications.Caches | |||
109 | } | 109 | } |
110 | 110 | ||
111 | 111 | ||
112 | public InventoryFolder HasSubFolder(LLUUID folderID) | 112 | public InventoryFolderImpl HasSubFolder(LLUUID folderID) |
113 | { | 113 | { |
114 | InventoryFolder returnFolder = null; | 114 | InventoryFolderImpl returnFolder = null; |
115 | if (this.SubFolders.ContainsKey(folderID)) | 115 | if (this.SubFolders.ContainsKey(folderID)) |
116 | { | 116 | { |
117 | returnFolder = this.SubFolders[folderID]; | 117 | returnFolder = this.SubFolders[folderID]; |
118 | } | 118 | } |
119 | else | 119 | else |
120 | { | 120 | { |
121 | foreach (InventoryFolder folder in this.SubFolders.Values) | 121 | foreach (InventoryFolderImpl folder in this.SubFolders.Values) |
122 | { | 122 | { |
123 | returnFolder = folder.HasSubFolder(folderID); | 123 | returnFolder = folder.HasSubFolder(folderID); |
124 | if (returnFolder != null) | 124 | if (returnFolder != null) |
@@ -140,4 +140,4 @@ namespace OpenSim.Framework.Communications.Caches | |||
140 | return itemList; | 140 | return itemList; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | } | 143 | } \ No newline at end of file |