diff options
author | lbsa71 | 2007-10-30 09:05:31 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-30 09:05:31 +0000 |
commit | 67e12b95ea7b68f4904a7484d77ecfd787d16d0c (patch) | |
tree | 20b00d24c8a7617017960432ec044852e3ad5fa9 /OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |
parent | * Deleted .user file (diff) | |
download | opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.zip opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.gz opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.bz2 opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.xz |
* Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/InventoryFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolder.cs | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs index 0905af8..3495e55 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |||
@@ -25,14 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
31 | using System.Text; | ||
32 | using System.IO; | ||
33 | using libsecondlife; | 29 | using libsecondlife; |
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Framework; | ||
36 | 30 | ||
37 | namespace OpenSim.Framework.Communications.Cache | 31 | namespace OpenSim.Framework.Communications.Cache |
38 | { | 32 | { |
@@ -44,17 +38,16 @@ namespace OpenSim.Framework.Communications.Cache | |||
44 | 38 | ||
45 | public InventoryFolderImpl(InventoryFolderBase folderbase) | 39 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
46 | { | 40 | { |
47 | this.agentID = folderbase.agentID; | 41 | agentID = folderbase.agentID; |
48 | this.folderID = folderbase.folderID; | 42 | folderID = folderbase.folderID; |
49 | this.name = folderbase.name; | 43 | name = folderbase.name; |
50 | this.parentID = folderbase.parentID; | 44 | parentID = folderbase.parentID; |
51 | this.type = folderbase.type; | 45 | type = folderbase.type; |
52 | this.version = folderbase.version; | 46 | version = folderbase.version; |
53 | } | 47 | } |
54 | 48 | ||
55 | public InventoryFolderImpl() | 49 | public InventoryFolderImpl() |
56 | { | 50 | { |
57 | |||
58 | } | 51 | } |
59 | 52 | ||
60 | // Methods | 53 | // Methods |
@@ -65,19 +58,19 @@ namespace OpenSim.Framework.Communications.Cache | |||
65 | subFold.folderID = folderID; | 58 | subFold.folderID = folderID; |
66 | subFold.type = (short) type; | 59 | subFold.type = (short) type; |
67 | subFold.parentID = this.folderID; | 60 | subFold.parentID = this.folderID; |
68 | subFold.agentID = this.agentID; | 61 | subFold.agentID = agentID; |
69 | this.SubFolders.Add(subFold.folderID, subFold); | 62 | SubFolders.Add(subFold.folderID, subFold); |
70 | return subFold; | 63 | return subFold; |
71 | } | 64 | } |
72 | 65 | ||
73 | public InventoryItemBase HasItem(LLUUID itemID) | 66 | public InventoryItemBase HasItem(LLUUID itemID) |
74 | { | 67 | { |
75 | InventoryItemBase base2 = null; | 68 | InventoryItemBase base2 = null; |
76 | if (this.Items.ContainsKey(itemID)) | 69 | if (Items.ContainsKey(itemID)) |
77 | { | 70 | { |
78 | return this.Items[itemID]; | 71 | return Items[itemID]; |
79 | } | 72 | } |
80 | foreach (InventoryFolderImpl folder in this.SubFolders.Values) | 73 | foreach (InventoryFolderImpl folder in SubFolders.Values) |
81 | { | 74 | { |
82 | base2 = folder.HasItem(itemID); | 75 | base2 = folder.HasItem(itemID); |
83 | if (base2 != null) | 76 | if (base2 != null) |
@@ -91,12 +84,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
91 | public bool DeleteItem(LLUUID itemID) | 84 | public bool DeleteItem(LLUUID itemID) |
92 | { | 85 | { |
93 | bool found = false; | 86 | bool found = false; |
94 | if (this.Items.ContainsKey(itemID)) | 87 | if (Items.ContainsKey(itemID)) |
95 | { | 88 | { |
96 | Items.Remove(itemID); | 89 | Items.Remove(itemID); |
97 | return true; | 90 | return true; |
98 | } | 91 | } |
99 | foreach (InventoryFolderImpl folder in this.SubFolders.Values) | 92 | foreach (InventoryFolderImpl folder in SubFolders.Values) |
100 | { | 93 | { |
101 | found = folder.DeleteItem(itemID); | 94 | found = folder.DeleteItem(itemID); |
102 | if (found == true) | 95 | if (found == true) |
@@ -111,13 +104,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
111 | public InventoryFolderImpl HasSubFolder(LLUUID folderID) | 104 | public InventoryFolderImpl HasSubFolder(LLUUID folderID) |
112 | { | 105 | { |
113 | InventoryFolderImpl returnFolder = null; | 106 | InventoryFolderImpl returnFolder = null; |
114 | if (this.SubFolders.ContainsKey(folderID)) | 107 | if (SubFolders.ContainsKey(folderID)) |
115 | { | 108 | { |
116 | returnFolder = this.SubFolders[folderID]; | 109 | returnFolder = SubFolders[folderID]; |
117 | } | 110 | } |
118 | else | 111 | else |
119 | { | 112 | { |
120 | foreach (InventoryFolderImpl folder in this.SubFolders.Values) | 113 | foreach (InventoryFolderImpl folder in SubFolders.Values) |
121 | { | 114 | { |
122 | returnFolder = folder.HasSubFolder(folderID); | 115 | returnFolder = folder.HasSubFolder(folderID); |
123 | if (returnFolder != null) | 116 | if (returnFolder != null) |
@@ -132,7 +125,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
132 | public List<InventoryItemBase> RequestListOfItems() | 125 | public List<InventoryItemBase> RequestListOfItems() |
133 | { | 126 | { |
134 | List<InventoryItemBase> itemList = new List<InventoryItemBase>(); | 127 | List<InventoryItemBase> itemList = new List<InventoryItemBase>(); |
135 | foreach (InventoryItemBase item in this.Items.Values) | 128 | foreach (InventoryItemBase item in Items.Values) |
136 | { | 129 | { |
137 | itemList.Add(item); | 130 | itemList.Add(item); |
138 | } | 131 | } |