From 649f304e764784d08f8a79729f70f66972c52c56 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 11 Apr 2008 18:19:21 +0000 Subject: * Minor inventory code cleanup following on from last patch --- OpenSim/Region/Communications/Local/LocalInventoryService.cs | 2 -- OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 7 ------- 2 files changed, 9 deletions(-) (limited to 'OpenSim/Region/Communications') 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; } } -- cgit v1.1