diff options
| author | Melanie | 2011-04-25 23:18:32 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-25 23:18:32 +0100 |
| commit | 9bf5e94b70c045e32e259f282c693c0fcea514a2 (patch) | |
| tree | 71a6b6029d2cc74cf34fd5e09719f39f9f7a9422 /OpenSim/Services/InventoryService | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Made things consistent between LocalInventoryServiceConnector and RemoteXInve... (diff) | |
| download | opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.zip opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.gz opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.bz2 opensim-SC-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/InventoryService')
| -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>(); |