mirror of
https://github.com/opensim/opensim.git
synced 2026-08-13 05:05:43 +08:00
System folders inventory cache added to OUT inventory modules. This tracks agents in and out of *sims* in order to fetch/drop their system folders from the cache. Also added region-side support for fetching the system folders from the inventory service. Nothing of this is called yet.
This commit is contained in:
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors.Inventory
|
||||
/// <param name="userID"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <returns></returns>
|
||||
public List<InventoryFolderBase> GetSystemFolders(string id, UUID sessionID)
|
||||
public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string id, UUID sessionID)
|
||||
{
|
||||
m_log.Debug("[HGInventory]: GetSystemFolders " + id);
|
||||
string url = string.Empty;
|
||||
@@ -138,7 +138,7 @@ namespace OpenSim.Services.Connectors.Inventory
|
||||
return connector.GetSystemFolders(userID, sessionID);
|
||||
}
|
||||
|
||||
return new List<InventoryFolderBase>();
|
||||
return new Dictionary<AssetType, InventoryFolderBase>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -57,7 +57,7 @@ namespace OpenSim.Services.Connectors
|
||||
/// <param name="userID"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <returns></returns>
|
||||
List<InventoryFolderBase> GetSystemFolders(string userID, UUID session_id);
|
||||
Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID session_id);
|
||||
|
||||
/// <summary>
|
||||
/// Gets everything (folders and items) inside a folder
|
||||
|
||||
@@ -161,11 +161,11 @@ namespace OpenSim.Services.Connectors
|
||||
/// <param name="userID"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <returns></returns>
|
||||
public List<InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
|
||||
public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
|
||||
{
|
||||
try
|
||||
{
|
||||
return SynchronousRestSessionObjectPoster<string, List<InventoryFolderBase>>.BeginPostObject(
|
||||
return SynchronousRestSessionObjectPoster<string, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject(
|
||||
"GET", m_ServerURI + "/SystemFolders/", userID, sessionID.ToString(), userID.ToString());
|
||||
}
|
||||
catch (Exception e)
|
||||
@@ -174,7 +174,7 @@ namespace OpenSim.Services.Connectors
|
||||
e.Source, e.Message);
|
||||
}
|
||||
|
||||
return new List<InventoryFolderBase>();
|
||||
return new Dictionary<AssetType, InventoryFolderBase>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user