diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index ec5751d..20d4e02 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -33,6 +33,7 @@ using System; | |||
33 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
34 | using System.Reflection; | 34 | using System.Reflection; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Monitoring; | ||
36 | using OpenSim.Data; | 37 | using OpenSim.Data; |
37 | using OpenSim.Server.Base; | 38 | using OpenSim.Server.Base; |
38 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
@@ -164,22 +165,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
164 | return m_InventoryService.GetInventorySkeleton(userId); | 165 | return m_InventoryService.GetInventorySkeleton(userId); |
165 | } | 166 | } |
166 | 167 | ||
167 | public InventoryCollection GetUserInventory(UUID id) | ||
168 | { | ||
169 | return m_InventoryService.GetUserInventory(id); | ||
170 | } | ||
171 | |||
172 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | ||
173 | { | ||
174 | m_InventoryService.GetUserInventory(userID, callback); | ||
175 | } | ||
176 | |||
177 | public InventoryFolderBase GetRootFolder(UUID userID) | 168 | public InventoryFolderBase GetRootFolder(UUID userID) |
178 | { | 169 | { |
179 | return m_InventoryService.GetRootFolder(userID); | 170 | return m_InventoryService.GetRootFolder(userID); |
180 | } | 171 | } |
181 | 172 | ||
182 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) | 173 | public InventoryFolderBase GetFolderForType(UUID userID, FolderType type) |
183 | { | 174 | { |
184 | return m_InventoryService.GetFolderForType(userID, type); | 175 | return m_InventoryService.GetFolderForType(userID, type); |
185 | } | 176 | } |
@@ -193,16 +184,30 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
193 | // Protect ourselves against the caller subsequently modifying the items list | 184 | // Protect ourselves against the caller subsequently modifying the items list |
194 | List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | 185 | List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); |
195 | 186 | ||
196 | Util.FireAndForget(delegate | 187 | WorkManager.RunInThread(delegate |
197 | { | 188 | { |
198 | foreach (InventoryItemBase item in items) | 189 | foreach (InventoryItemBase item in items) |
199 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | 190 | if (!string.IsNullOrEmpty(item.CreatorData)) |
200 | }); | 191 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); |
192 | }, null, string.Format("GetFolderContent (user {0}, folder {1})", userID, folderID)); | ||
201 | } | 193 | } |
202 | 194 | ||
203 | return invCol; | 195 | return invCol; |
204 | } | 196 | } |
205 | 197 | ||
198 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) | ||
199 | { | ||
200 | InventoryCollection[] invColl = new InventoryCollection[folderIDs.Length]; | ||
201 | int i = 0; | ||
202 | foreach (UUID fid in folderIDs) | ||
203 | { | ||
204 | invColl[i++] = GetFolderContent(principalID, fid); | ||
205 | } | ||
206 | |||
207 | return invColl; | ||
208 | |||
209 | } | ||
210 | |||
206 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 211 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
207 | { | 212 | { |
208 | return m_InventoryService.GetFolderItems(userID, folderID); | 213 | return m_InventoryService.GetFolderItems(userID, folderID); |
@@ -302,6 +307,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
302 | return item; | 307 | return item; |
303 | } | 308 | } |
304 | 309 | ||
310 | public InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] itemIDs) | ||
311 | { | ||
312 | return m_InventoryService.GetMultipleItems(userID, itemIDs); | ||
313 | } | ||
314 | |||
305 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 315 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
306 | { | 316 | { |
307 | return m_InventoryService.GetFolder(folder); | 317 | return m_InventoryService.GetFolder(folder); |