diff options
author | Justin Clark-Casey (justincc) | 2010-07-14 17:55:06 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-14 17:55:06 +0100 |
commit | 5b03e050352d633ae1594f6486550c80d812c456 (patch) | |
tree | b3debd9a9a4860add5a3529cc70bbf26ee4fa026 /OpenSim/Services | |
parent | comment out obsolete assert that 'item has been passed to another user since ... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-5b03e050352d633ae1594f6486550c80d812c456.zip opensim-SC-5b03e050352d633ae1594f6486550c80d812c456.tar.gz opensim-SC-5b03e050352d633ae1594f6486550c80d812c456.tar.bz2 opensim-SC-5b03e050352d633ae1594f6486550c80d812c456.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index f48bf60..bb24292 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -259,13 +259,15 @@ namespace OpenSim.Services.InventoryService | |||
259 | 259 | ||
260 | public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) | 260 | public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) |
261 | { | 261 | { |
262 | // m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID); | ||
263 | |||
262 | // Since we probably don't get a valid principal here, either ... | 264 | // Since we probably don't get a valid principal here, either ... |
263 | // | 265 | // |
264 | List<InventoryItemBase> invItems = new List<InventoryItemBase>(); | 266 | List<InventoryItemBase> invItems = new List<InventoryItemBase>(); |
265 | 267 | ||
266 | XInventoryItem[] items = m_Database.GetItems( | 268 | XInventoryItem[] items = m_Database.GetItems( |
267 | new string[] { "parentFolderID"}, | 269 | new string[] { "parentFolderID" }, |
268 | new string[] { UUID.Zero.ToString() }); | 270 | new string[] { folderID.ToString() }); |
269 | 271 | ||
270 | foreach (XInventoryItem i in items) | 272 | foreach (XInventoryItem i in items) |
271 | invItems.Add(ConvertToOpenSim(i)); | 273 | invItems.Add(ConvertToOpenSim(i)); |