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),
|
itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
|
||||||
new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>());
|
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));
|
Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
InventoryFolderBase folder2
|
InventoryFolderBase folder2
|
||||||
= InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");
|
= InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
|
@ -229,14 +229,12 @@ namespace OpenSim.Region.CoreModules.Framework.Library
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public InventoryItemBase GetItem(InventoryItemBase item) { return null; }
|
public InventoryItemBase GetItem(InventoryItemBase item) { return null; }
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId) { return null; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get a folder, given by its UUID
|
/// Get a folder, given by its UUID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="folder"></param>
|
/// <param name="folder"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; }
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Does the given user have an inventory structure?
|
/// Does the given user have an inventory structure?
|
||||||
|
|
|
@ -205,8 +205,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
|
|
||||||
public abstract InventoryItemBase GetItem(InventoryItemBase item);
|
public abstract InventoryItemBase GetItem(InventoryItemBase item);
|
||||||
|
|
||||||
public abstract InventoryFolderBase GetFolder(UUID folderId, UUID userId);
|
|
||||||
|
|
||||||
public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
|
public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* 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);
|
return connector.DeleteItems(ownerID, itemIDs);
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryItemBase GetItem(InventoryItemBase item)
|
public InventoryItemBase GetItem(InventoryItemBase item)
|
||||||
{
|
{
|
||||||
if (item == null)
|
if (item == null)
|
||||||
return null;
|
return null;
|
||||||
|
@ -486,12 +486,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
return connector.GetItem(item);
|
return connector.GetItem(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
|
||||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
|
||||||
{
|
{
|
||||||
if (folder == null)
|
if (folder == null)
|
||||||
return null;
|
return null;
|
||||||
|
@ -508,12 +503,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
return connector.GetFolder(folder);
|
return connector.GetFolder(folder);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool HasInventoryForUser(UUID userID)
|
public bool HasInventoryForUser(UUID userID)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
||||||
{
|
{
|
||||||
return new List<InventoryItemBase>();
|
return new List<InventoryItemBase>();
|
||||||
}
|
}
|
||||||
|
|
|
@ -267,11 +267,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
return m_InventoryService.GetFolder(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);
|
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)
|
public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
if (folder == null)
|
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)
|
if (itemIDs == null)
|
||||||
return false;
|
return false;
|
||||||
|
@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
return m_RemoteConnector.DeleteItems(ownerID, itemIDs);
|
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);
|
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID);
|
||||||
if (item == null)
|
if (item == null)
|
||||||
|
@ -271,12 +271,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
return m_RemoteConnector.GetItem(item);
|
return m_RemoteConnector.GetItem(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
|
||||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
|
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
|
||||||
if (folder == null)
|
if (folder == null)
|
||||||
|
@ -285,17 +280,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
return m_RemoteConnector.GetFolder(folder);
|
return m_RemoteConnector.GetFolder(folder);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool HasInventoryForUser(UUID userID)
|
public bool HasInventoryForUser(UUID userID)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
||||||
{
|
{
|
||||||
return new List<InventoryItemBase>();
|
return new List<InventoryItemBase>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int GetAssetPermissions(UUID userID, UUID assetID)
|
public int GetAssetPermissions(UUID userID, UUID assetID)
|
||||||
{
|
{
|
||||||
return m_RemoteConnector.GetAssetPermissions(userID, assetID);
|
return m_RemoteConnector.GetAssetPermissions(userID, assetID);
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,11 +171,6 @@ namespace OpenSim.Services.Connectors
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
|
|
|
@ -431,11 +431,6 @@ namespace OpenSim.Services.Connectors
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
|
@ -314,11 +314,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
||||||
m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found");
|
m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get a folder, given by its UUID
|
/// Get a folder, given by its UUID
|
||||||
|
|
|
@ -169,14 +169,6 @@ namespace OpenSim.Services.Interfaces
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
InventoryItemBase GetItem(InventoryItemBase item);
|
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>
|
/// <summary>
|
||||||
/// Get a folder, given by its UUID
|
/// Get a folder, given by its UUID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -439,20 +439,15 @@ namespace OpenSim.Services.InventoryService
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
|
m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
|
|
||||||
if (result != null)
|
|
||||||
return result;
|
|
||||||
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
return GetFolder(folder.ID, folder.Owner);
|
InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
|
||||||
|
if (result != null)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
|
public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
|
||||||
|
|
|
@ -368,11 +368,6 @@ namespace OpenSim.Services.InventoryService
|
||||||
|
|
||||||
return ConvertToOpenSim(items[0]);
|
return ConvertToOpenSim(items[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
return GetFolder(new InventoryFolderBase(folderId, userId));
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
|
|
|
@ -162,11 +162,6 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue