diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 15 |
1 files changed, 5 insertions, 10 deletions
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 | } |