diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/CachedUserInfo.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index f2dd2bf..cb1eb5a 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -171,21 +171,21 @@ namespace OpenSim.Framework.Communications.Cache | |||
171 | { | 171 | { |
172 | if ((userID == UserProfile.UUID) && (RootFolder != null)) | 172 | if ((userID == UserProfile.UUID) && (RootFolder != null)) |
173 | { | 173 | { |
174 | if (itemInfo.parentFolderID == RootFolder.folderID) | 174 | if (itemInfo.Folder == RootFolder.folderID) |
175 | { | 175 | { |
176 | if (!RootFolder.Items.ContainsKey(itemInfo.inventoryID)) | 176 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) |
177 | { | 177 | { |
178 | RootFolder.Items.Add(itemInfo.inventoryID, itemInfo); | 178 | RootFolder.Items.Add(itemInfo.ID, itemInfo); |
179 | } | 179 | } |
180 | } | 180 | } |
181 | else | 181 | else |
182 | { | 182 | { |
183 | InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.parentFolderID); | 183 | InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.Folder); |
184 | if (folder != null) | 184 | if (folder != null) |
185 | { | 185 | { |
186 | if (!folder.Items.ContainsKey(itemInfo.inventoryID)) | 186 | if (!folder.Items.ContainsKey(itemInfo.ID)) |
187 | { | 187 | { |
188 | folder.Items.Add(itemInfo.inventoryID, itemInfo); | 188 | folder.Items.Add(itemInfo.ID, itemInfo); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | } | 191 | } |
@@ -214,7 +214,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
214 | bool result = false; | 214 | bool result = false; |
215 | if ((userID == UserProfile.UUID) && (RootFolder != null)) | 215 | if ((userID == UserProfile.UUID) && (RootFolder != null)) |
216 | { | 216 | { |
217 | result = RootFolder.DeleteItem(item.inventoryID); | 217 | result = RootFolder.DeleteItem(item.ID); |
218 | if (result) | 218 | if (result) |
219 | { | 219 | { |
220 | m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item); | 220 | m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item); |