aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs39
1 files changed, 30 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 23bddcf..47f970e 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -193,7 +193,6 @@ namespace OpenSim.Framework.Communications.Cache
193 193
194 if ((fold = libraryRoot.HasSubFolder(folderID)) != null) 194 if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
195 { 195 {
196 System.Console.WriteLine("fetching librarysubfolder");
197 remoteClient.SendInventoryFolderDetails( 196 remoteClient.SendInventoryFolderDetails(
198 libraryRoot.agentID, folderID, fold.RequestListOfItems(), 197 libraryRoot.agentID, folderID, fold.RequestListOfItems(),
199 fold.RequestListOfFolders(), fetchFolders, fetchItems); 198 fold.RequestListOfFolders(), fetchFolders, fetchItems);
@@ -208,14 +207,12 @@ namespace OpenSim.Framework.Communications.Cache
208 { 207 {
209 if (userProfile.RootFolder.folderID == folderID) 208 if (userProfile.RootFolder.folderID == folderID)
210 { 209 {
211 System.Console.Write("fetching root folder"); 210 remoteClient.SendInventoryFolderDetails(
212 if (fetchItems) 211 remoteClient.AgentId, folderID, userProfile.RootFolder.RequestListOfItems(),
213 { 212 userProfile.RootFolder.RequestListOfFolders(),
214 remoteClient.SendInventoryFolderDetails( 213 fetchFolders, fetchItems);
215 remoteClient.AgentId, folderID, userProfile.RootFolder.RequestListOfItems(), 214
216 userProfile.RootFolder.RequestListOfFolders(), 215 return;
217 fetchFolders, fetchItems);
218 }
219 } 216 }
220 else 217 else
221 { 218 {
@@ -224,11 +221,35 @@ namespace OpenSim.Framework.Communications.Cache
224 remoteClient.SendInventoryFolderDetails( 221 remoteClient.SendInventoryFolderDetails(
225 remoteClient.AgentId, folderID, fold.RequestListOfItems(), 222 remoteClient.AgentId, folderID, fold.RequestListOfItems(),
226 fold.RequestListOfFolders(), fetchFolders, fetchItems); 223 fold.RequestListOfFolders(), fetchFolders, fetchItems);
224
227 return; 225 return;
228 } 226 }
229 } 227 }
230 } 228 }
229 else
230 {
231 MainLog.Instance.Error(
232 "INVENTORYCACHE", "Could not find root folder for user {0}", remoteClient.Name);
233
234 return;
235 }
231 } 236 }
237 else
238 {
239 MainLog.Instance.Error(
240 "INVENTORYCACHE",
241 "Could not find user profile for {0} for folder {1}",
242 remoteClient.Name, folderID);
243
244 return;
245 }
246
247 // If we've reached this point then we couldn't find the folder, even though the client thinks
248 // it exists
249 MainLog.Instance.Error(
250 "INVENTORYCACHE",
251 "Could not find folder {0} for user {1}",
252 folderID, remoteClient.Name);
232 } 253 }
233 254
234 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID) 255 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID)