ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
John Hurliman
2010-06-11 15:43:22 -07:00
parent d1a324888b c61e998580
commit b5bc2816fc
15 changed files with 23 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
View File

@@ -171,11 +171,6 @@ namespace OpenSim.Services.Connectors
{
return null;
}
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
{
return null;
}
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
{

5
OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
View File

@@ -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

7
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* 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");
return null;
}
public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
{
return GetFolder(new InventoryFolderBase(folderId, userId));
}
/// <summary>
/// Get a folder, given by its UUID

8
OpenSim/Services/Interfaces/IInventoryService.cs
View File

@@ -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>

17
OpenSim/Services/InventoryService/InventoryService.cs
View File

@@ -439,20 +439,15 @@ namespace OpenSim.Services.InventoryService
m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
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)
{
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)

5
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@@ -368,11 +368,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)
{