aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/CachedUserInfo.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index cb1eb5a..e39333b 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
60 /// <param name="folder"></param> 60 /// <param name="folder"></param>
61 private void AddPendingFolder(InventoryFolderImpl folder) 61 private void AddPendingFolder(InventoryFolderImpl folder)
62 { 62 {
63 LLUUID parentFolderId = folder.parentID; 63 LLUUID parentFolderId = folder.ParentID;
64 64
65 if (pendingCategorizationFolders.ContainsKey(parentFolderId)) 65 if (pendingCategorizationFolders.ContainsKey(parentFolderId))
66 { 66 {
@@ -83,17 +83,17 @@ namespace OpenSim.Framework.Communications.Cache
83 /// </param> 83 /// </param>
84 private void ResolvePendingFolders(InventoryFolderImpl parent) 84 private void ResolvePendingFolders(InventoryFolderImpl parent)
85 { 85 {
86 if (pendingCategorizationFolders.ContainsKey(parent.folderID)) 86 if (pendingCategorizationFolders.ContainsKey(parent.ID))
87 { 87 {
88 foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.folderID]) 88 foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.ID])
89 { 89 {
90// m_log.DebugFormat( 90// m_log.DebugFormat(
91// "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}", 91// "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}",
92// folder.name, folder.folderID, parent.name, parent.folderID); 92// folder.name, folder.folderID, parent.name, parent.folderID);
93 93
94 if (!parent.SubFolders.ContainsKey(folder.folderID)) 94 if (!parent.SubFolders.ContainsKey(folder.ID))
95 { 95 {
96 parent.SubFolders.Add(folder.folderID, folder); 96 parent.SubFolders.Add(folder.ID, folder);
97 } 97 }
98 } 98 }
99 } 99 }
@@ -118,16 +118,16 @@ namespace OpenSim.Framework.Communications.Cache
118 { 118 {
119 if (RootFolder == null) 119 if (RootFolder == null)
120 { 120 {
121 if (folderInfo.parentID == LLUUID.Zero) 121 if (folderInfo.ParentID == LLUUID.Zero)
122 { 122 {
123 RootFolder = folderInfo; 123 RootFolder = folderInfo;
124 } 124 }
125 } 125 }
126 else if (RootFolder.folderID == folderInfo.parentID) 126 else if (RootFolder.ID == folderInfo.ParentID)
127 { 127 {
128 if (!RootFolder.SubFolders.ContainsKey(folderInfo.folderID)) 128 if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID))
129 { 129 {
130 RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo); 130 RootFolder.SubFolders.Add(folderInfo.ID, folderInfo);
131 } 131 }
132 else 132 else
133 { 133 {
@@ -136,12 +136,12 @@ namespace OpenSim.Framework.Communications.Cache
136 } 136 }
137 else 137 else
138 { 138 {
139 InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.parentID); 139 InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.ParentID);
140 if (folder != null) 140 if (folder != null)
141 { 141 {
142 if (!folder.SubFolders.ContainsKey(folderInfo.folderID)) 142 if (!folder.SubFolders.ContainsKey(folderInfo.ID))
143 { 143 {
144 folder.SubFolders.Add(folderInfo.folderID, folderInfo); 144 folder.SubFolders.Add(folderInfo.ID, folderInfo);
145 } 145 }
146 } 146 }
147 else 147 else
@@ -171,7 +171,7 @@ 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.Folder == RootFolder.folderID) 174 if (itemInfo.Folder == RootFolder.ID)
175 { 175 {
176 if (!RootFolder.Items.ContainsKey(itemInfo.ID)) 176 if (!RootFolder.Items.ContainsKey(itemInfo.ID))
177 { 177 {