diff options
| author | Mic Bowman | 2011-04-25 08:41:21 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-25 08:41:21 -0700 |
| commit | 1d7c83c39fffe6580f4cf1c693581979c97d7eaa (patch) | |
| tree | e600e4551ba957aa47dfbba7925c65ee7d06ccfc /OpenSim/Services/InventoryService/XInventoryService.cs | |
| parent | Fix a bug looping through the priority queues. This should fix the problem (diff) | |
| parent | Removed unused libraries: RAILS.dll and dependencies. (diff) | |
| download | opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.zip opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.gz opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.bz2 opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')
| -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>(); |