mirror of
https://github.com/opensim/opensim.git
synced 2026-05-19 22:45:43 +08:00
875211b262
* You may also need to clear your cache before seeing any effect. * These fixes may or may not affect inventory on the RC client. * These fixes should make non-root folders work better, stop inventory failure on first login, allow trash to be emptied and make texture picker in object edit view work properly * Fixes are 1) make initial root folder request wait for async inventory delivery, 2) deliver all folders in the initial login skeleton, not just the root child ones and 3) deal with situations where we receive child folders from the inventory service before their parent is received.
428 lines
17 KiB
C#
428 lines
17 KiB
C#
/*
|
|
* Copyright (c) Contributors, http://opensimulator.org/
|
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of the OpenSim Project nor the
|
|
* names of its contributors may be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Reflection;
|
|
using libsecondlife;
|
|
using OpenSim.Framework.Console;
|
|
|
|
namespace OpenSim.Framework.Communications
|
|
{
|
|
public abstract class InventoryServiceBase : IInventoryServices
|
|
{
|
|
private static readonly log4net.ILog m_log
|
|
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
|
|
|
protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
|
|
|
|
#region Plugin methods
|
|
|
|
/// <summary>
|
|
/// Adds a new user server plugin - plugins will be requested in the order they were loaded.
|
|
/// </summary>
|
|
/// <param name="FileName">The filename to the user server plugin DLL</param>
|
|
public void AddPlugin(string FileName)
|
|
{
|
|
if (!String.IsNullOrEmpty(FileName))
|
|
{
|
|
m_log.Info("[AGENTINVENTORY]: Inventory storage: Attempting to load " + FileName);
|
|
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
|
|
|
|
foreach (Type pluginType in pluginAssembly.GetTypes())
|
|
{
|
|
if (!pluginType.IsAbstract)
|
|
{
|
|
Type typeInterface = pluginType.GetInterface("IInventoryData", true);
|
|
|
|
if (typeInterface != null)
|
|
{
|
|
IInventoryData plug =
|
|
(IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
|
|
plug.Initialise();
|
|
m_plugins.Add(plug.getName(), plug);
|
|
m_log.Info("[AGENTINVENTORY]: Added IInventoryData Interface");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region IInventoryServices methods
|
|
|
|
/// <summary>
|
|
/// Guid to UUID wrapper for same name IInventoryServices method
|
|
/// </summary>
|
|
/// <param name="rawUserID"></param>
|
|
/// <returns></returns>
|
|
public List<InventoryFolderBase> RequestFirstLevelFolders(Guid rawUserID)
|
|
{
|
|
LLUUID userID = new LLUUID(rawUserID);
|
|
return RequestFirstLevelFolders(userID);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Guid to UUID wrapper for same name IInventoryServices method
|
|
/// </summary>
|
|
/// <param name="rawUserID"></param>
|
|
/// <returns></returns>
|
|
public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
|
|
{
|
|
LLUUID userID = new LLUUID(rawUserID);
|
|
return GetInventorySkeleton(userID);
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
|
|
{
|
|
List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
|
|
InventoryFolderBase rootFolder = null;
|
|
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
rootFolder = plugin.Value.getUserRootFolder(userID);
|
|
if (rootFolder != null)
|
|
{
|
|
m_log.Info(
|
|
"[INVENTORY]: Found root folder for user with ID " + userID + ". Retrieving inventory contents.");
|
|
|
|
inventoryList = plugin.Value.getInventoryFolders(rootFolder.folderID);
|
|
inventoryList.Insert(0, rootFolder);
|
|
return inventoryList;
|
|
}
|
|
}
|
|
|
|
m_log.Warn(
|
|
"[INVENTORY]: Could not find a root folder belonging to user with ID " + userID);
|
|
|
|
return inventoryList;
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
|
|
{
|
|
m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
|
|
|
|
List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
|
|
|
|
InventoryFolderBase rootFolder = RequestRootFolder(userId);
|
|
userFolders.Add(rootFolder);
|
|
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
|
|
userFolders.AddRange(folders);
|
|
}
|
|
|
|
// foreach (InventoryFolderBase folder in userFolders)
|
|
// {
|
|
// m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
|
|
// }
|
|
|
|
return userFolders;
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder)
|
|
{
|
|
// FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
plugin.Value.moveInventoryFolder(folder);
|
|
}
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public virtual bool HasInventoryForUser(LLUUID userID)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public InventoryFolderBase RequestRootFolder(LLUUID userID)
|
|
{
|
|
// FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
return plugin.Value.getUserRootFolder(userID);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public virtual InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
// See IInventoryServices
|
|
public void CreateNewUserInventory(LLUUID user)
|
|
{
|
|
InventoryFolderBase existingRootFolder = RequestRootFolder(user);
|
|
|
|
if (null != existingRootFolder)
|
|
{
|
|
m_log.ErrorFormat("[AGENT INVENTORY]: " +
|
|
"Did not create a new inventory for user {0} since they already have "
|
|
+ "a root inventory folder with id {1}", user, existingRootFolder);
|
|
}
|
|
else
|
|
{
|
|
UsersInventory inven = new UsersInventory();
|
|
inven.CreateNewInventorySet(user);
|
|
AddNewInventorySet(inven);
|
|
}
|
|
}
|
|
|
|
public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
|
|
InventoryItemInfo itemCallBack);
|
|
public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder);
|
|
public abstract void MoveExistingInventoryFolder(InventoryFolderBase folder);
|
|
public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
|
|
public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
|
|
|
|
#endregion
|
|
|
|
#region Methods used by GridInventoryService
|
|
|
|
public List<InventoryFolderBase> RequestSubFolders(LLUUID parentFolderID)
|
|
{
|
|
List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
return plugin.Value.getInventoryFolders(parentFolderID);
|
|
}
|
|
return inventoryList;
|
|
}
|
|
|
|
public List<InventoryItemBase> RequestFolderItems(LLUUID folderID)
|
|
{
|
|
List<InventoryItemBase> itemsList = new List<InventoryItemBase>();
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
itemsList = plugin.Value.getInventoryInFolder(folderID);
|
|
return itemsList;
|
|
}
|
|
return itemsList;
|
|
}
|
|
|
|
#endregion
|
|
|
|
protected void AddFolder(InventoryFolderBase folder)
|
|
{
|
|
m_log.DebugFormat(
|
|
"[INVENTORY SERVICE BASE]: Adding folder {0}, {1} to {2}", folder.name, folder.folderID, folder.parentID);
|
|
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
plugin.Value.addInventoryFolder(folder);
|
|
}
|
|
}
|
|
|
|
protected void MoveFolder(InventoryFolderBase folder)
|
|
{
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
plugin.Value.moveInventoryFolder(folder);
|
|
}
|
|
}
|
|
|
|
protected void AddItem(InventoryItemBase item)
|
|
{
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
plugin.Value.addInventoryItem(item);
|
|
}
|
|
}
|
|
|
|
protected void DeleteItem(InventoryItemBase item)
|
|
{
|
|
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
|
|
{
|
|
plugin.Value.deleteInventoryItem(item.inventoryID);
|
|
}
|
|
}
|
|
|
|
private void AddNewInventorySet(UsersInventory inventory)
|
|
{
|
|
foreach (InventoryFolderBase folder in inventory.Folders.Values)
|
|
{
|
|
AddFolder(folder);
|
|
}
|
|
}
|
|
|
|
private class UsersInventory
|
|
{
|
|
public Dictionary<LLUUID, InventoryFolderBase> Folders = new Dictionary<LLUUID, InventoryFolderBase>();
|
|
public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();
|
|
|
|
public virtual void CreateNewInventorySet(LLUUID user)
|
|
{
|
|
InventoryFolderBase folder = new InventoryFolderBase();
|
|
|
|
folder.parentID = LLUUID.Zero;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "My Inventory";
|
|
folder.type = (short)AssetType.Folder;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
LLUUID rootFolder = folder.folderID;
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Animations";
|
|
folder.type = (short)AssetType.Animation;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Body Parts";
|
|
folder.type = (short)AssetType.Bodypart;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Calling Cards";
|
|
folder.type = (short)AssetType.CallingCard;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Clothing";
|
|
folder.type = (short)AssetType.Clothing;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Gestures";
|
|
folder.type = (short)AssetType.Gesture;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Landmarks";
|
|
folder.type = (short)AssetType.Landmark;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Lost And Found";
|
|
folder.type = (short)AssetType.LostAndFoundFolder;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Notecards";
|
|
folder.type = (short)AssetType.Notecard;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Objects";
|
|
folder.type = (short)AssetType.Primitive;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Photo Album";
|
|
folder.type = (short)AssetType.SnapshotFolder;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Scripts";
|
|
folder.type = (short)AssetType.LSLText;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Sounds";
|
|
folder.type = (short)AssetType.Sound;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Textures";
|
|
folder.type = (short)AssetType.Texture;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
|
|
folder = new InventoryFolderBase();
|
|
folder.parentID = rootFolder;
|
|
folder.agentID = user;
|
|
folder.folderID = LLUUID.Random();
|
|
folder.name = "Trash";
|
|
folder.type = (short)AssetType.TrashFolder;
|
|
folder.version = 1;
|
|
Folders.Add(folder.folderID, folder);
|
|
}
|
|
}
|
|
}
|
|
}
|