diff options
Diffstat (limited to '')
7 files changed, 15 insertions, 39 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index d003d2d..00bd27a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -575,9 +575,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
575 | itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), | 575 | itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), |
576 | new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>()); | 576 | new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>()); |
577 | 577 | ||
578 | InventoryFolderBase folder1Post = scene.InventoryService.GetFolder(folder1.ID, ua1.PrincipalID); | 578 | InventoryFolderBase folder1Post |
579 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName); | ||
579 | Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID)); | 580 | Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID)); |
580 | |||
581 | /* | 581 | /* |
582 | InventoryFolderBase folder2 | 582 | InventoryFolderBase folder2 |
583 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b"); | 583 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b"); |
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs index 112ccd8..49589fd 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -229,14 +229,12 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
229 | /// <returns></returns> | 229 | /// <returns></returns> |
230 | public InventoryItemBase GetItem(InventoryItemBase item) { return null; } | 230 | public InventoryItemBase GetItem(InventoryItemBase item) { return null; } |
231 | 231 | ||
232 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) { return null; } | ||
233 | |||
234 | /// <summary> | 232 | /// <summary> |
235 | /// Get a folder, given by its UUID | 233 | /// Get a folder, given by its UUID |
236 | /// </summary> | 234 | /// </summary> |
237 | /// <param name="folder"></param> | 235 | /// <param name="folder"></param> |
238 | /// <returns></returns> | 236 | /// <returns></returns> |
239 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; } | 237 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; } |
240 | 238 | ||
241 | /// <summary> | 239 | /// <summary> |
242 | /// Does the given user have an inventory structure? | 240 | /// Does the given user have an inventory structure? |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs index 5b13d58..1e51187 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs | |||
@@ -205,8 +205,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
205 | 205 | ||
206 | public abstract InventoryItemBase GetItem(InventoryItemBase item); | 206 | public abstract InventoryItemBase GetItem(InventoryItemBase item); |
207 | 207 | ||
208 | public abstract InventoryFolderBase GetFolder(UUID folderId, UUID userId); | ||
209 | |||
210 | public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder); | 208 | public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder); |
211 | 209 | ||
212 | /// <summary> | 210 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index fc30347..e09db15 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
470 | return connector.DeleteItems(ownerID, itemIDs); | 470 | return connector.DeleteItems(ownerID, itemIDs); |
471 | } | 471 | } |
472 | 472 | ||
473 | public InventoryItemBase GetItem(InventoryItemBase item) | 473 | public InventoryItemBase GetItem(InventoryItemBase item) |
474 | { | 474 | { |
475 | if (item == null) | 475 | if (item == null) |
476 | return null; | 476 | return null; |
@@ -486,12 +486,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
486 | return connector.GetItem(item); | 486 | return connector.GetItem(item); |
487 | } | 487 | } |
488 | 488 | ||
489 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | 489 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
490 | { | ||
491 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
492 | } | ||
493 | |||
494 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | ||
495 | { | 490 | { |
496 | if (folder == null) | 491 | if (folder == null) |
497 | return null; | 492 | return null; |
@@ -508,12 +503,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
508 | return connector.GetFolder(folder); | 503 | return connector.GetFolder(folder); |
509 | } | 504 | } |
510 | 505 | ||
511 | public bool HasInventoryForUser(UUID userID) | 506 | public bool HasInventoryForUser(UUID userID) |
512 | { | 507 | { |
513 | return false; | 508 | return false; |
514 | } | 509 | } |
515 | 510 | ||
516 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | 511 | public List<InventoryItemBase> GetActiveGestures(UUID userId) |
517 | { | 512 | { |
518 | return new List<InventoryItemBase>(); | 513 | return new List<InventoryItemBase>(); |
519 | } | 514 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 76be791..22bd04c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -267,11 +267,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
267 | return item; | 267 | return item; |
268 | } | 268 | } |
269 | 269 | ||
270 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
271 | { | ||
272 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
273 | } | ||
274 | |||
275 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 270 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
276 | { | 271 | { |
277 | return m_InventoryService.GetFolder(folder); | 272 | return m_InventoryService.GetFolder(folder); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 6d43280..aa3b30d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -307,11 +307,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
307 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); | 307 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); |
308 | } | 308 | } |
309 | 309 | ||
310 | public override InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
311 | { | ||
312 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
313 | } | ||
314 | |||
315 | public override InventoryFolderBase GetFolder(InventoryFolderBase folder) | 310 | public override InventoryFolderBase GetFolder(InventoryFolderBase folder) |
316 | { | 311 | { |
317 | if (folder == null) | 312 | if (folder == null) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index b1e21a1..277060d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
250 | } | 250 | } |
251 | 251 | ||
252 | 252 | ||
253 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) | 253 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) |
254 | { | 254 | { |
255 | if (itemIDs == null) | 255 | if (itemIDs == null) |
256 | return false; | 256 | return false; |
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
260 | return m_RemoteConnector.DeleteItems(ownerID, itemIDs); | 260 | return m_RemoteConnector.DeleteItems(ownerID, itemIDs); |
261 | } | 261 | } |
262 | 262 | ||
263 | public InventoryItemBase GetItem(InventoryItemBase item) | 263 | public InventoryItemBase GetItem(InventoryItemBase item) |
264 | { | 264 | { |
265 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); | 265 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); |
266 | if (item == null) | 266 | if (item == null) |
@@ -271,12 +271,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
271 | return m_RemoteConnector.GetItem(item); | 271 | return m_RemoteConnector.GetItem(item); |
272 | } | 272 | } |
273 | 273 | ||
274 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | 274 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
275 | { | ||
276 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
277 | } | ||
278 | |||
279 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | ||
280 | { | 275 | { |
281 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); | 276 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); |
282 | if (folder == null) | 277 | if (folder == null) |
@@ -285,17 +280,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
285 | return m_RemoteConnector.GetFolder(folder); | 280 | return m_RemoteConnector.GetFolder(folder); |
286 | } | 281 | } |
287 | 282 | ||
288 | public bool HasInventoryForUser(UUID userID) | 283 | public bool HasInventoryForUser(UUID userID) |
289 | { | 284 | { |
290 | return false; | 285 | return false; |
291 | } | 286 | } |
292 | 287 | ||
293 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | 288 | public List<InventoryItemBase> GetActiveGestures(UUID userId) |
294 | { | 289 | { |
295 | return new List<InventoryItemBase>(); | 290 | return new List<InventoryItemBase>(); |
296 | } | 291 | } |
297 | 292 | ||
298 | public int GetAssetPermissions(UUID userID, UUID assetID) | 293 | public int GetAssetPermissions(UUID userID, UUID assetID) |
299 | { | 294 | { |
300 | return m_RemoteConnector.GetAssetPermissions(userID, assetID); | 295 | return m_RemoteConnector.GetAssetPermissions(userID, assetID); |
301 | } | 296 | } |