aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs2
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs7
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
200 /// <summary> 200 /// <summary>
201 /// Callback invoked when an item is received from an async request to the inventory service. 201 /// Callback invoked when an item is received from an async request to the inventory service.
202 /// 202 ///
203 /// FIXME: We're assuming here that items are always received after all the folders have been 203 /// We're assuming here that items are always received after all the folders have been
204 /// received. 204 /// received.
205 /// </summary> 205 /// </summary>
206 /// <param name="userID"></param> 206 /// <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
37 /// Callback used when a user's inventory is received from the inventory service 37 /// Callback used when a user's inventory is received from the inventory service
38 /// </summary> 38 /// </summary>
39 public delegate void InventoryReceiptCallback(LLUUID userId, ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items); 39 public delegate void InventoryReceiptCallback(LLUUID userId, ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items);
40
41 //public delegate void InventoryFolderInfo(LLUUID userID, InventoryFolderImpl folderInfo);
42
43 //public delegate void InventoryItemInfo(LLUUID userID, InventoryItemBase itemInfo);
44 40
45 /// <summary> 41 /// <summary>
46 /// Defines all the operations one can perform on a user's inventory. 42 /// 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
52 { 52 {
53 if (folder.ParentID == LLUUID.Zero) 53 if (folder.ParentID == LLUUID.Zero)
54 { 54 {
55 //rootFolder = RequestInventoryFolder(userID, folder, callback);
56 rootFolder = new InventoryFolderImpl(folder); 55 rootFolder = new InventoryFolderImpl(folder);
57 folders.Add(rootFolder); 56 folders.Add(rootFolder);
58 } 57 }
@@ -64,7 +63,6 @@ namespace OpenSim.Region.Communications.Local
64 { 63 {
65 if (folder.ID != rootFolder.ID) 64 if (folder.ID != rootFolder.ID)
66 { 65 {
67 //RequestInventoryFolder(userID, folder, callback);
68 folders.Add(new InventoryFolderImpl(folder)); 66 folders.Add(new InventoryFolderImpl(folder));
69 } 67 }
70 } 68 }
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
114 { 114 {
115 rootFolder = new InventoryFolderImpl(folder); 115 rootFolder = new InventoryFolderImpl(folder);
116 folders.Add(rootFolder); 116 folders.Add(rootFolder);
117 //request.FolderCallBack(userID, newfolder);
118 } 117 }
119 } 118 }
120 119
@@ -125,14 +124,12 @@ namespace OpenSim.Region.Communications.OGS1
125 if (folder.ID != rootFolder.ID) 124 if (folder.ID != rootFolder.ID)
126 { 125 {
127 folders.Add(new InventoryFolderImpl(folder)); 126 folders.Add(new InventoryFolderImpl(folder));
128 //request.FolderCallBack(userID, newfolder);
129 } 127 }
130 } 128 }
131 129
132 foreach (InventoryItemBase item in response.AllItems) 130 foreach (InventoryItemBase item in response.AllItems)
133 { 131 {
134 items.Add(item); 132 items.Add(item);
135 //request.ItemCallBack(userID, item);
136 } 133 }
137 } 134 }
138 135
@@ -237,14 +234,10 @@ namespace OpenSim.Region.Communications.OGS1
237 { 234 {
238 public LLUUID UserID; 235 public LLUUID UserID;
239 public InventoryReceiptCallback Callback; 236 public InventoryReceiptCallback Callback;
240 //public InventoryFolderInfo FolderCallBack;
241 //public InventoryItemInfo ItemCallBack;
242 237
243 public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback) 238 public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback)
244 { 239 {
245 UserID = userId; 240 UserID = userId;
246 //FolderCallBack = folderCall;
247 //ItemCallBack = itemCall;
248 Callback = callback; 241 Callback = callback;
249 } 242 }
250 } 243 }