* Minor inventory code cleanup following on from last patch

4 files changed, 1 insertions, 14 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index cf701cb..d97cf01 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// <summary>
         /// Callback invoked when an item is received from an async request to the inventory service.
         /// 
-        /// FIXME: We're assuming here that items are always received after all the folders have been
+        /// We're assuming here that items are always received after all the folders have been
         /// received.
         /// </summary>
         /// <param name="userID"></param>
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 40e7ffd..5e7f855 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -37,10 +37,6 @@ namespace OpenSim.Framework.Communications
     /// Callback used when a user's inventory is received from the inventory service
     /// </summary>
     public delegate void InventoryReceiptCallback(LLUUID userId, ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items);
-                                                  
-    //public delegate void InventoryFolderInfo(LLUUID userID, InventoryFolderImpl folderInfo);
-
-    //public delegate void InventoryItemInfo(LLUUID userID, InventoryItemBase itemInfo);
 
     /// <summary>
     /// Defines all the operations one can perform on a user's inventory.
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 13cb6de..e81a39f 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -52,7 +52,6 @@ namespace OpenSim.Region.Communications.Local
             {
                 if (folder.ParentID == LLUUID.Zero)
                 {
-                    //rootFolder = RequestInventoryFolder(userID, folder, callback);
                     rootFolder = new InventoryFolderImpl(folder);
                     folders.Add(rootFolder);
                 }
@@ -64,7 +63,6 @@ namespace OpenSim.Region.Communications.Local
                 {
                     if (folder.ID != rootFolder.ID)
                     {
-                        //RequestInventoryFolder(userID, folder, callback);
                         folders.Add(new InventoryFolderImpl(folder));
                     }
                 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index f31127f..dc26ce2 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -114,7 +114,6 @@ namespace OpenSim.Region.Communications.OGS1
                     {
                         rootFolder = new InventoryFolderImpl(folder);
                         folders.Add(rootFolder);
-                        //request.FolderCallBack(userID, newfolder);
                     }
                 }
 
@@ -125,14 +124,12 @@ namespace OpenSim.Region.Communications.OGS1
                         if (folder.ID != rootFolder.ID)
                         {
                             folders.Add(new InventoryFolderImpl(folder));
-                            //request.FolderCallBack(userID, newfolder);
                         }
                     }
 
                     foreach (InventoryItemBase item in response.AllItems)
                     {
                         items.Add(item);
-                        //request.ItemCallBack(userID, item);
                     }
                 }
                 
@@ -237,14 +234,10 @@ namespace OpenSim.Region.Communications.OGS1
         {
             public LLUUID UserID;
             public InventoryReceiptCallback Callback;
-            //public InventoryFolderInfo FolderCallBack;
-            //public InventoryItemInfo ItemCallBack;
 
             public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback)
             {
                 UserID = userId;
-                //FolderCallBack = folderCall;
-                //ItemCallBack = itemCall;
                 Callback = callback;
             }
         }