Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
This reverts commit 3525195bc9
.
soprefactor
parent
3525195bc9
commit
0dce4f1997
|
@ -575,9 +575,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
|||
itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
|
||||
new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>());
|
||||
|
||||
InventoryFolderBase folder1Post = scene.InventoryService.GetFolder(folder1.ID, ua1.PrincipalID);
|
||||
InventoryFolderBase folder1Post
|
||||
= InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
|
||||
Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
|
||||
|
||||
/*
|
||||
InventoryFolderBase folder2
|
||||
= InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
|
@ -229,8 +229,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library
|
|||
/// <returns></returns>
|
||||
public InventoryItemBase GetItem(InventoryItemBase item) { return null; }
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId) { return null; }
|
||||
|
||||
/// <summary>
|
||||
/// Get a folder, given by its UUID
|
||||
/// </summary>
|
||||
|
|
|
@ -205,8 +205,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
|
||||
public abstract InventoryItemBase GetItem(InventoryItemBase item);
|
||||
|
||||
public abstract InventoryFolderBase GetFolder(UUID folderId, UUID userId);
|
||||
|
||||
public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
|
@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return connector.DeleteItems(ownerID, itemIDs);
|
||||
}
|
||||
|
||||
public InventoryItemBase GetItem(InventoryItemBase item)
|
||||
public InventoryItemBase GetItem(InventoryItemBase item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
@ -486,12 +486,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return connector.GetItem(item);
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
if (folder == null)
|
||||
return null;
|
||||
|
@ -508,12 +503,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return connector.GetFolder(folder);
|
||||
}
|
||||
|
||||
public bool HasInventoryForUser(UUID userID)
|
||||
public bool HasInventoryForUser(UUID userID)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
||||
{
|
||||
return new List<InventoryItemBase>();
|
||||
}
|
||||
|
|
|
@ -267,11 +267,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return item;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
return m_InventoryService.GetFolder(folder);
|
||||
|
|
|
@ -307,11 +307,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
|
||||
}
|
||||
|
||||
public override InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
if (folder == null)
|
||||
|
|
|
@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
}
|
||||
|
||||
|
||||
public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
|
||||
public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
|
||||
{
|
||||
if (itemIDs == null)
|
||||
return false;
|
||||
|
@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return m_RemoteConnector.DeleteItems(ownerID, itemIDs);
|
||||
}
|
||||
|
||||
public InventoryItemBase GetItem(InventoryItemBase item)
|
||||
public InventoryItemBase GetItem(InventoryItemBase item)
|
||||
{
|
||||
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID);
|
||||
if (item == null)
|
||||
|
@ -271,12 +271,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return m_RemoteConnector.GetItem(item);
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
|
||||
if (folder == null)
|
||||
|
@ -285,17 +280,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
|||
return m_RemoteConnector.GetFolder(folder);
|
||||
}
|
||||
|
||||
public bool HasInventoryForUser(UUID userID)
|
||||
public bool HasInventoryForUser(UUID userID)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
||||
{
|
||||
return new List<InventoryItemBase>();
|
||||
}
|
||||
|
||||
public int GetAssetPermissions(UUID userID, UUID assetID)
|
||||
public int GetAssetPermissions(UUID userID, UUID assetID)
|
||||
{
|
||||
return m_RemoteConnector.GetAssetPermissions(userID, assetID);
|
||||
}
|
||||
|
|
|
@ -172,11 +172,6 @@ namespace OpenSim.Services.Connectors
|
|||
return null;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
return null;
|
||||
|
|
|
@ -431,11 +431,6 @@ namespace OpenSim.Services.Connectors
|
|||
return null;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
try
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
|
@ -315,11 +315,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
return null;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get a folder, given by its UUID
|
||||
/// </summary>
|
||||
|
|
|
@ -169,14 +169,6 @@ namespace OpenSim.Services.Interfaces
|
|||
/// <returns></returns>
|
||||
InventoryItemBase GetItem(InventoryItemBase item);
|
||||
|
||||
/// <summary>
|
||||
/// Get a folder.
|
||||
/// </summary>
|
||||
/// <param name="folderId"></param>
|
||||
/// <param name="userId"></param>
|
||||
/// <returns></returns>
|
||||
InventoryFolderBase GetFolder(UUID folderId, UUID userId);
|
||||
|
||||
/// <summary>
|
||||
/// Get a folder, given by its UUID
|
||||
/// </summary>
|
||||
|
|
|
@ -440,21 +440,16 @@ namespace OpenSim.Services.InventoryService
|
|||
return null;
|
||||
}
|
||||
|
||||
public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
|
||||
InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
|
||||
if (result != null)
|
||||
return result;
|
||||
|
||||
m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
|
||||
m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
|
||||
return null;
|
||||
}
|
||||
|
||||
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
return GetFolder(folder.ID, folder.Owner);
|
||||
}
|
||||
|
||||
public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
|
||||
{
|
||||
m_log.InfoFormat("[INVENTORY SERVICE]: Deleting {0} folders from user {1}", folderIDs.Count, ownerID);
|
||||
|
|
|
@ -369,11 +369,6 @@ namespace OpenSim.Services.InventoryService
|
|||
return ConvertToOpenSim(items[0]);
|
||||
}
|
||||
|
||||
public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
||||
}
|
||||
|
||||
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||
|
|
|
@ -163,11 +163,6 @@ namespace OpenSim.Tests.Common.Mock
|
|||
return null;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
return null;
|
||||
|
|
Loading…
Reference in New Issue