diff options
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 10 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index cd9f2bf..a662abb 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
@@ -158,7 +158,10 @@ namespace OpenSim.Services.Connectors | |||
158 | public InventoryCollection GetFolderContent(UUID principalID, UUID folderID) | 158 | public InventoryCollection GetFolderContent(UUID principalID, UUID folderID) |
159 | { | 159 | { |
160 | InventoryCollection inventory = new InventoryCollection(); | 160 | InventoryCollection inventory = new InventoryCollection(); |
161 | 161 | inventory.Folders = new List<InventoryFolderBase>(); | |
162 | inventory.Items = new List<InventoryItemBase>(); | ||
163 | inventory.UserID = principalID; | ||
164 | |||
162 | try | 165 | try |
163 | { | 166 | { |
164 | Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT", | 167 | Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT", |
@@ -172,11 +175,6 @@ namespace OpenSim.Services.Connectors | |||
172 | if (ret.Count == 0) | 175 | if (ret.Count == 0) |
173 | return null; | 176 | return null; |
174 | 177 | ||
175 | |||
176 | inventory.Folders = new List<InventoryFolderBase>(); | ||
177 | inventory.Items = new List<InventoryItemBase>(); | ||
178 | inventory.UserID = principalID; | ||
179 | |||
180 | Dictionary<string,object> folders = | 178 | Dictionary<string,object> folders = |
181 | (Dictionary<string,object>)ret["FOLDERS"]; | 179 | (Dictionary<string,object>)ret["FOLDERS"]; |
182 | Dictionary<string,object> items = | 180 | Dictionary<string,object> items = |
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>(); |