Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Justin Clark-Casey (justincc)
commit
33df0c2efd
|
|
@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
if (name == Name)
|
if (name == Name)
|
||||||
{
|
{
|
||||||
InitialiseCommon(source);
|
InitialiseCommon(source);
|
||||||
IConfig transferConfig = source.Configs["HGEntityTransfer"];
|
IConfig transferConfig = source.Configs["HGEntityTransferModule"];
|
||||||
if (transferConfig != null)
|
if (transferConfig != null)
|
||||||
m_RestrictInventoryAccessAbroad = transferConfig.GetBoolean("RestrictInventoryAccessAbroad", false);
|
m_RestrictInventoryAccessAbroad = transferConfig.GetBoolean("RestrictInventoryAccessAbroad", false);
|
||||||
|
|
||||||
|
|
@ -94,6 +94,31 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
client.OnTeleportHomeRequest += TeleportHome;
|
client.OnTeleportHomeRequest += TeleportHome;
|
||||||
client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
|
client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
|
||||||
client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
|
client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
|
||||||
|
client.OnCompleteMovementToRegion += new Action<IClientAPI, bool>(OnCompleteMovementToRegion);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void OnCompleteMovementToRegion(IClientAPI client, bool arg2)
|
||||||
|
{
|
||||||
|
// HACK HACK -- just seeing how the viewer responds
|
||||||
|
// Let's send the Suitcase or the real root folder folder for incoming HG agents
|
||||||
|
// Visiting agents get their suitcase contents; incoming local users get their real root folder's content
|
||||||
|
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: OnCompleteMovementToRegion of user {0}", client.AgentId);
|
||||||
|
object sp = null;
|
||||||
|
if (client.Scene.TryGetScenePresence(client.AgentId, out sp))
|
||||||
|
{
|
||||||
|
if (sp is ScenePresence)
|
||||||
|
{
|
||||||
|
AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId);
|
||||||
|
if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
|
||||||
|
{
|
||||||
|
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: ViaHGLogin");
|
||||||
|
if (m_RestrictInventoryAccessAbroad)
|
||||||
|
{
|
||||||
|
RestoreRootFolderContents(client);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -105,6 +130,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
{
|
{
|
||||||
m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
|
m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
|
||||||
m_Initialized = true;
|
m_Initialized = true;
|
||||||
|
|
||||||
|
scene.AddCommand(
|
||||||
|
"HG", this, "send inventory",
|
||||||
|
"send inventory",
|
||||||
|
"Don't use this",
|
||||||
|
HandleSendInventory);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -369,7 +401,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
|
InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
|
||||||
if (root != null)
|
if (root != null)
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Removing root inventory");
|
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Removing root inventory for user {0}", client.AgentId);
|
||||||
InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
|
InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
|
||||||
UUID[] ids = new UUID[content.Folders.Count];
|
UUID[] ids = new UUID[content.Folders.Count];
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
@ -388,12 +420,26 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
|
|
||||||
private void RestoreRootFolderContents(IClientAPI client)
|
private void RestoreRootFolderContents(IClientAPI client)
|
||||||
{
|
{
|
||||||
// Restore the user's inventory, because we removed it earlier on
|
if (client is IClientCore)
|
||||||
InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
|
|
||||||
if (root != null)
|
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory");
|
IClientCore core = (IClientCore)client;
|
||||||
|
IClientInventory inv;
|
||||||
|
|
||||||
|
if (core.TryGet<IClientInventory>(out inv))
|
||||||
|
{
|
||||||
|
InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
|
||||||
client.SendBulkUpdateInventory(root);
|
client.SendBulkUpdateInventory(root);
|
||||||
|
//if (root != null)
|
||||||
|
//{
|
||||||
|
// m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory for user {0}", client.AgentId);
|
||||||
|
// InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
|
||||||
|
// m_log.DebugFormat("[XXX]: Folder name {0}, id {1}, parent {2}", root.Name, root.ID, root.ParentID);
|
||||||
|
// foreach (InventoryItemBase i in content.Items)
|
||||||
|
// m_log.DebugFormat("[XXX]: Name={0}, folderID={1}", i.Name, i.Folder);
|
||||||
|
|
||||||
|
// inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray());
|
||||||
|
//}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -413,5 +459,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
|
region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
|
||||||
return region;
|
return region;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void HandleSendInventory(string module, string[] cmd)
|
||||||
|
{
|
||||||
|
m_Scenes[0].ForEachClient(delegate(IClientAPI client)
|
||||||
|
{
|
||||||
|
RestoreRootFolderContents(client);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1163,22 +1163,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
|
friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
// HACK HACK -- just seeing how the viewer responds
|
|
||||||
// Let's send the Suitcase or the real root folder folder for incoming HG agents
|
|
||||||
// Visiting agents get their suitcase contents; incoming local users get their real root folder's content
|
|
||||||
AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID);
|
|
||||||
if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
|
|
||||||
{
|
|
||||||
// HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS
|
|
||||||
IConfig config = m_scene.Config.Configs["HGEntityTransferModule"];
|
|
||||||
if (config != null && config.GetBoolean("RestrictInventoryAccessAbroad", false))
|
|
||||||
{
|
|
||||||
m_log.DebugFormat("[SCENE]: Sending root folder to viewer...");
|
|
||||||
InventoryFolderBase root = m_scene.InventoryService.GetRootFolder(client.AgentId);
|
|
||||||
//InventoryCollection rootContents = InventoryService.GetFolderContent(client.AgentId, root.ID);
|
|
||||||
client.SendBulkUpdateInventory(root);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// m_log.DebugFormat(
|
// m_log.DebugFormat(
|
||||||
// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
|
// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,368 @@
|
||||||
|
/*
|
||||||
|
* 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 OpenSimulator 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 OpenMetaverse;
|
||||||
|
using log4net;
|
||||||
|
using Nini.Config;
|
||||||
|
using System.Reflection;
|
||||||
|
using OpenSim.Services.Base;
|
||||||
|
using OpenSim.Services.Interfaces;
|
||||||
|
using OpenSim.Services.InventoryService;
|
||||||
|
using OpenSim.Data;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Server.Base;
|
||||||
|
|
||||||
|
namespace OpenSim.Services.HypergridService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Hypergrid inventory service. It serves the IInventoryService interface,
|
||||||
|
/// but implements it in ways that are appropriate for inter-grid
|
||||||
|
/// inventory exchanges. Specifically, it does not performs deletions
|
||||||
|
/// and it responds to GetRootFolder requests with the ID of the
|
||||||
|
/// Suitcase folder, not the actual "My Inventory" folder.
|
||||||
|
/// </summary>
|
||||||
|
public class HGSuitcaseInventoryService : XInventoryService, IInventoryService
|
||||||
|
{
|
||||||
|
private static readonly ILog m_log =
|
||||||
|
LogManager.GetLogger(
|
||||||
|
MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
private string m_HomeURL;
|
||||||
|
private IUserAccountService m_UserAccountService;
|
||||||
|
|
||||||
|
private UserAccountCache m_Cache;
|
||||||
|
|
||||||
|
public HGSuitcaseInventoryService(IConfigSource config, string configName)
|
||||||
|
: base(config, configName)
|
||||||
|
{
|
||||||
|
m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Starting with config name {0}", configName);
|
||||||
|
if (configName != string.Empty)
|
||||||
|
m_ConfigName = configName;
|
||||||
|
|
||||||
|
if (m_Database == null)
|
||||||
|
m_log.WarnFormat("[XXX]: m_Database is null!");
|
||||||
|
|
||||||
|
//
|
||||||
|
// Try reading the [InventoryService] section, if it exists
|
||||||
|
//
|
||||||
|
IConfig invConfig = config.Configs[m_ConfigName];
|
||||||
|
if (invConfig != null)
|
||||||
|
{
|
||||||
|
// realm = authConfig.GetString("Realm", realm);
|
||||||
|
string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty);
|
||||||
|
if (userAccountsDll == string.Empty)
|
||||||
|
throw new Exception("Please specify UserAccountsService in HGInventoryService configuration");
|
||||||
|
|
||||||
|
Object[] args = new Object[] { config };
|
||||||
|
m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountsDll, args);
|
||||||
|
if (m_UserAccountService == null)
|
||||||
|
throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
|
||||||
|
|
||||||
|
// legacy configuration [obsolete]
|
||||||
|
m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty);
|
||||||
|
// Preferred
|
||||||
|
m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
|
||||||
|
|
||||||
|
m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting...");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CreateUserInventory(UUID principalID)
|
||||||
|
{
|
||||||
|
// NOGO
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public override List<InventoryFolderBase> GetInventorySkeleton(UUID principalID)
|
||||||
|
{
|
||||||
|
// NOGO for this inventory service
|
||||||
|
return new List<InventoryFolderBase>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override InventoryFolderBase GetRootFolder(UUID principalID)
|
||||||
|
{
|
||||||
|
m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
|
||||||
|
if (m_Database == null)
|
||||||
|
m_log.ErrorFormat("[XXX]: m_Database is NULL!");
|
||||||
|
|
||||||
|
// Let's find out the local root folder
|
||||||
|
XInventoryFolder root = GetRootXFolder(principalID); ;
|
||||||
|
if (root == null)
|
||||||
|
{
|
||||||
|
m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve local root folder for user {0}", principalID);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Warp! Root folder for travelers is the suitcase folder
|
||||||
|
XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
|
||||||
|
|
||||||
|
if (suitcase == null)
|
||||||
|
{
|
||||||
|
m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: User {0} does not have a Suitcase folder. Creating it...", principalID);
|
||||||
|
// make one, and let's add it to the user's inventory as a direct child of the root folder
|
||||||
|
suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase");
|
||||||
|
if (suitcase == null)
|
||||||
|
m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder");
|
||||||
|
|
||||||
|
m_Database.StoreFolder(suitcase);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now let's change the folder ID to match that of the real root folder
|
||||||
|
SetAsRootFolder(suitcase, root.folderID);
|
||||||
|
|
||||||
|
return ConvertToOpenSim(suitcase);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
|
||||||
|
{
|
||||||
|
//m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type);
|
||||||
|
return GetRootFolder(principalID);
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// Use the inherited methods
|
||||||
|
//
|
||||||
|
public override InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
|
||||||
|
{
|
||||||
|
InventoryCollection coll = null;
|
||||||
|
XInventoryFolder root = GetRootXFolder(principalID);
|
||||||
|
if (folderID == root.folderID) // someone's asking for the root folder, we'll give them the suitcase
|
||||||
|
{
|
||||||
|
XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
|
||||||
|
if (suitcase != null)
|
||||||
|
{
|
||||||
|
coll = base.GetFolderContent(principalID, suitcase.folderID);
|
||||||
|
foreach (InventoryFolderBase f in coll.Folders)
|
||||||
|
f.ParentID = root.folderID;
|
||||||
|
foreach (InventoryItemBase i in coll.Items)
|
||||||
|
i.Folder = root.folderID;
|
||||||
|
m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderContent for root folder returned content for suitcase folder");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
coll = base.GetFolderContent(principalID, folderID);
|
||||||
|
m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderContent for non-root folder {0}", folderID);
|
||||||
|
}
|
||||||
|
if (coll == null)
|
||||||
|
{
|
||||||
|
m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Something wrong with user {0}'s suitcase folder", principalID);
|
||||||
|
coll = new InventoryCollection();
|
||||||
|
}
|
||||||
|
return coll;
|
||||||
|
}
|
||||||
|
|
||||||
|
//public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public override bool AddFolder(InventoryFolderBase folder)
|
||||||
|
//{
|
||||||
|
// // Check if it's under the Suitcase folder
|
||||||
|
// List<InventoryFolderBase> skel = base.GetInventorySkeleton(folder.Owner);
|
||||||
|
// InventoryFolderBase suitcase = GetRootFolder(folder.Owner);
|
||||||
|
// List<InventoryFolderBase> suitDescendents = GetDescendents(skel, suitcase.ID);
|
||||||
|
|
||||||
|
// foreach (InventoryFolderBase f in suitDescendents)
|
||||||
|
// if (folder.ParentID == f.ID)
|
||||||
|
// {
|
||||||
|
// XInventoryFolder xFolder = ConvertFromOpenSim(folder);
|
||||||
|
// return m_Database.StoreFolder(xFolder);
|
||||||
|
// }
|
||||||
|
// return false;
|
||||||
|
//}
|
||||||
|
|
||||||
|
private List<InventoryFolderBase> GetDescendents(List<InventoryFolderBase> lst, UUID root)
|
||||||
|
{
|
||||||
|
List<InventoryFolderBase> direct = lst.FindAll(delegate(InventoryFolderBase f) { return f.ParentID == root; });
|
||||||
|
if (direct == null)
|
||||||
|
return new List<InventoryFolderBase>();
|
||||||
|
|
||||||
|
List<InventoryFolderBase> indirect = new List<InventoryFolderBase>();
|
||||||
|
foreach (InventoryFolderBase f in direct)
|
||||||
|
indirect.AddRange(GetDescendents(lst, f.ID));
|
||||||
|
|
||||||
|
direct.AddRange(indirect);
|
||||||
|
return direct;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use inherited method
|
||||||
|
//public bool UpdateFolder(InventoryFolderBase folder)
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public override bool MoveFolder(InventoryFolderBase folder)
|
||||||
|
//{
|
||||||
|
// XInventoryFolder[] x = m_Database.GetFolders(
|
||||||
|
// new string[] { "folderID" },
|
||||||
|
// new string[] { folder.ID.ToString() });
|
||||||
|
|
||||||
|
// if (x.Length == 0)
|
||||||
|
// return false;
|
||||||
|
|
||||||
|
// // Check if it's under the Suitcase folder
|
||||||
|
// List<InventoryFolderBase> skel = base.GetInventorySkeleton(folder.Owner);
|
||||||
|
// InventoryFolderBase suitcase = GetRootFolder(folder.Owner);
|
||||||
|
// List<InventoryFolderBase> suitDescendents = GetDescendents(skel, suitcase.ID);
|
||||||
|
|
||||||
|
// foreach (InventoryFolderBase f in suitDescendents)
|
||||||
|
// if (folder.ParentID == f.ID)
|
||||||
|
// {
|
||||||
|
// x[0].parentFolderID = folder.ParentID;
|
||||||
|
// return m_Database.StoreFolder(x[0]);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// return false;
|
||||||
|
//}
|
||||||
|
|
||||||
|
public override bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
|
||||||
|
{
|
||||||
|
// NOGO
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool PurgeFolder(InventoryFolderBase folder)
|
||||||
|
{
|
||||||
|
// NOGO
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unfortunately we need to use the inherited method because of how DeRez works.
|
||||||
|
// The viewer sends the folderID hard-wired in the derez message
|
||||||
|
//public override bool AddItem(InventoryItemBase item)
|
||||||
|
//{
|
||||||
|
// // Check if it's under the Suitcase folder
|
||||||
|
// List<InventoryFolderBase> skel = base.GetInventorySkeleton(item.Owner);
|
||||||
|
// InventoryFolderBase suitcase = GetRootFolder(item.Owner);
|
||||||
|
// List<InventoryFolderBase> suitDescendents = GetDescendents(skel, suitcase.ID);
|
||||||
|
|
||||||
|
// foreach (InventoryFolderBase f in suitDescendents)
|
||||||
|
// if (item.Folder == f.ID)
|
||||||
|
// return m_Database.StoreItem(ConvertFromOpenSim(item));
|
||||||
|
|
||||||
|
// return false;
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public override bool UpdateItem(InventoryItemBase item)
|
||||||
|
//{
|
||||||
|
// // Check if it's under the Suitcase folder
|
||||||
|
// List<InventoryFolderBase> skel = base.GetInventorySkeleton(item.Owner);
|
||||||
|
// InventoryFolderBase suitcase = GetRootFolder(item.Owner);
|
||||||
|
// List<InventoryFolderBase> suitDescendents = GetDescendents(skel, suitcase.ID);
|
||||||
|
|
||||||
|
// foreach (InventoryFolderBase f in suitDescendents)
|
||||||
|
// if (item.Folder == f.ID)
|
||||||
|
// return m_Database.StoreItem(ConvertFromOpenSim(item));
|
||||||
|
|
||||||
|
// return false;
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public override bool MoveItems(UUID principalID, List<InventoryItemBase> items)
|
||||||
|
//{
|
||||||
|
// // Principal is b0rked. *sigh*
|
||||||
|
// //
|
||||||
|
// // Let's assume they all have the same principal
|
||||||
|
// // Check if it's under the Suitcase folder
|
||||||
|
// List<InventoryFolderBase> skel = base.GetInventorySkeleton(items[0].Owner);
|
||||||
|
// InventoryFolderBase suitcase = GetRootFolder(items[0].Owner);
|
||||||
|
// List<InventoryFolderBase> suitDescendents = GetDescendents(skel, suitcase.ID);
|
||||||
|
|
||||||
|
// foreach (InventoryItemBase i in items)
|
||||||
|
// {
|
||||||
|
// foreach (InventoryFolderBase f in suitDescendents)
|
||||||
|
// if (i.Folder == f.ID)
|
||||||
|
// m_Database.MoveItem(i.ID.ToString(), i.Folder.ToString());
|
||||||
|
// }
|
||||||
|
|
||||||
|
// return true;
|
||||||
|
//}
|
||||||
|
|
||||||
|
// Let these pass. Use inherited methods.
|
||||||
|
//public bool DeleteItems(UUID principalID, List<UUID> itemIDs)
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public override InventoryItemBase GetItem(InventoryItemBase item)
|
||||||
|
//{
|
||||||
|
// InventoryItemBase it = base.GetItem(item);
|
||||||
|
// if (it != null)
|
||||||
|
// {
|
||||||
|
// UserAccount user = m_Cache.GetUser(it.CreatorId);
|
||||||
|
|
||||||
|
// // Adjust the creator data
|
||||||
|
// if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
|
||||||
|
// it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
|
||||||
|
// }
|
||||||
|
// return it;
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public List<InventoryItemBase> GetActiveGestures(UUID principalID)
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
|
||||||
|
//public int GetAssetPermissions(UUID principalID, UUID assetID)
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
|
||||||
|
private XInventoryFolder GetRootXFolder(UUID principalID)
|
||||||
|
{
|
||||||
|
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||||
|
new string[] { "agentID", "folderName", "type" },
|
||||||
|
new string[] { principalID.ToString(), "My Inventory", ((int)AssetType.RootFolder).ToString() });
|
||||||
|
|
||||||
|
if (folders != null && folders.Length > 0)
|
||||||
|
return folders[0];
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private XInventoryFolder GetSuitcaseXFolder(UUID principalID)
|
||||||
|
{
|
||||||
|
// Warp! Root folder for travelers
|
||||||
|
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||||
|
new string[] { "agentID", "type" },
|
||||||
|
new string[] { principalID.ToString(), "100" }); // This is a special folder type...
|
||||||
|
|
||||||
|
if (folders != null && folders.Length > 0)
|
||||||
|
return folders[0];
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetAsRootFolder(XInventoryFolder suitcase, UUID rootID)
|
||||||
|
{
|
||||||
|
suitcase.folderID = rootID;
|
||||||
|
suitcase.parentFolderID = UUID.Zero;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue