diff options
author | Melanie | 2011-04-26 23:20:13 +0200 |
---|---|---|
committer | Melanie | 2011-04-26 23:20:13 +0200 |
commit | 4ed54dcc013b2901cb74b81c1300972a9591c612 (patch) | |
tree | 7f58e5d7dbd71eb66a798e68fbed030ae8e38217 /OpenSim/Services/InventoryService | |
parent | Try to repair attachments ion the fly if they are detached and reattached. (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-4ed54dcc013b2901cb74b81c1300972a9591c612.zip opensim-SC-4ed54dcc013b2901cb74b81c1300972a9591c612.tar.gz opensim-SC-4ed54dcc013b2901cb74b81c1300972a9591c612.tar.bz2 opensim-SC-4ed54dcc013b2901cb74b81c1300972a9591c612.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index e602412..0af35c8 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -244,7 +244,7 @@ namespace OpenSim.Services.InventoryService | |||
244 | // connector. So we disregard the principal and look | 244 | // connector. So we disregard the principal and look |
245 | // by ID. | 245 | // by ID. |
246 | // | 246 | // |
247 | m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString()); | 247 | //m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString()); |
248 | InventoryCollection inventory = new InventoryCollection(); | 248 | InventoryCollection inventory = new InventoryCollection(); |
249 | inventory.UserID = principalID; | 249 | inventory.UserID = principalID; |
250 | inventory.Folders = new List<InventoryFolderBase>(); | 250 | inventory.Folders = new List<InventoryFolderBase>(); |