OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Minor inventory code cleanup following on from last patch

0.6.0-stable
Justin Clarke Casey 2008-04-11 18:19:21 +00:00
parent a5176c2e2c
commit 649f304e76
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -200,7 +200,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <summary> /// <summary>
/// Callback invoked when an item is received from an async request to the inventory service. /// 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. /// received.
/// </summary> /// </summary>
/// <param name="userID"></param> /// <param name="userID"></param>

4
OpenSim/Framework/Communications/IInventoryServices.cs
View File

@ -38,10 +38,6 @@ namespace OpenSim.Framework.Communications
/// </summary> /// </summary>
public delegate void InventoryReceiptCallback(LLUUID userId, ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items); 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> /// <summary>
/// Defines all the operations one can perform on a user's inventory. /// Defines all the operations one can perform on a user's inventory.
/// </summary> /// </summary>

2
OpenSim/Region/Communications/Local/LocalInventoryService.cs
View File

@ -52,7 +52,6 @@ namespace OpenSim.Region.Communications.Local
{ {
if (folder.ParentID == LLUUID.Zero) if (folder.ParentID == LLUUID.Zero)
{ {
//rootFolder = RequestInventoryFolder(userID, folder, callback);
rootFolder = new InventoryFolderImpl(folder); rootFolder = new InventoryFolderImpl(folder);
folders.Add(rootFolder); folders.Add(rootFolder);
} }
@ -64,7 +63,6 @@ namespace OpenSim.Region.Communications.Local
{ {
if (folder.ID != rootFolder.ID) if (folder.ID != rootFolder.ID)
{ {
//RequestInventoryFolder(userID, folder, callback);
folders.Add(new InventoryFolderImpl(folder)); folders.Add(new InventoryFolderImpl(folder));
} }
} }

7
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@ -114,7 +114,6 @@ namespace OpenSim.Region.Communications.OGS1
{ {
rootFolder = new InventoryFolderImpl(folder); rootFolder = new InventoryFolderImpl(folder);
folders.Add(rootFolder); folders.Add(rootFolder);
//request.FolderCallBack(userID, newfolder);
} }
} }
@ -125,14 +124,12 @@ namespace OpenSim.Region.Communications.OGS1
if (folder.ID != rootFolder.ID) if (folder.ID != rootFolder.ID)
{ {
folders.Add(new InventoryFolderImpl(folder)); folders.Add(new InventoryFolderImpl(folder));
//request.FolderCallBack(userID, newfolder);
} }
} }
foreach (InventoryItemBase item in response.AllItems) foreach (InventoryItemBase item in response.AllItems)
{ {
items.Add(item); items.Add(item);
//request.ItemCallBack(userID, item);
} }
} }
@ -237,14 +234,10 @@ namespace OpenSim.Region.Communications.OGS1
{ {
public LLUUID UserID; public LLUUID UserID;
public InventoryReceiptCallback Callback; public InventoryReceiptCallback Callback;
//public InventoryFolderInfo FolderCallBack;
//public InventoryItemInfo ItemCallBack;
public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback) public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback)
{ {
UserID = userId; UserID = userId;
//FolderCallBack = folderCall;
//ItemCallBack = itemCall;
Callback = callback; Callback = callback;
} }
} }