mirror of
https://github.com/opensim/opensim.git
synced 2026-05-19 22:45:43 +08:00
1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
125 lines
5.4 KiB
C#
125 lines
5.4 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 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;
|
|
using System.Collections.Generic;
|
|
using System.Reflection;
|
|
using log4net;
|
|
using Nini.Config;
|
|
using OpenMetaverse;
|
|
using OpenMetaverse.StructuredData;
|
|
using OpenSim.Framework;
|
|
using OpenSim.Framework.Capabilities;
|
|
using OpenSim.Region.Framework.Interfaces;
|
|
using OpenSim.Framework.Servers.HttpServer;
|
|
using OpenSim.Services.Interfaces;
|
|
using Caps = OpenSim.Framework.Capabilities.Caps;
|
|
using OSDArray = OpenMetaverse.StructuredData.OSDArray;
|
|
using OSDMap = OpenMetaverse.StructuredData.OSDMap;
|
|
|
|
namespace OpenSim.Capabilities.Handlers
|
|
{
|
|
public class FetchInventory2Handler
|
|
{
|
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
|
|
|
private IInventoryService m_inventoryService;
|
|
|
|
public FetchInventory2Handler(IInventoryService invService)
|
|
{
|
|
m_inventoryService = invService;
|
|
}
|
|
|
|
public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
|
|
{
|
|
// m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capabilty request");
|
|
|
|
OSDMap requestmap = (OSDMap)OSDParser.DeserializeLLSDXml(Utils.StringToBytes(request));
|
|
OSDArray itemsRequested = (OSDArray)requestmap["items"];
|
|
|
|
string reply;
|
|
LLSDFetchInventory llsdReply = new LLSDFetchInventory();
|
|
|
|
foreach (OSDMap osdItemId in itemsRequested)
|
|
{
|
|
UUID itemId = osdItemId["item_id"].AsUUID();
|
|
|
|
InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId));
|
|
|
|
if (item != null)
|
|
{
|
|
// We don't know the agent that this request belongs to so we'll use the agent id of the item
|
|
// which will be the same for all items.
|
|
llsdReply.agent_id = item.Owner;
|
|
|
|
llsdReply.items.Array.Add(ConvertInventoryItem(item));
|
|
}
|
|
}
|
|
|
|
reply = LLSDHelpers.SerialiseLLSDReply(llsdReply);
|
|
|
|
return reply;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Convert an internal inventory item object into an LLSD object.
|
|
/// </summary>
|
|
/// <param name="invItem"></param>
|
|
/// <returns></returns>
|
|
private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
|
|
{
|
|
LLSDInventoryItem llsdItem = new LLSDInventoryItem();
|
|
llsdItem.asset_id = invItem.AssetID;
|
|
llsdItem.created_at = invItem.CreationDate;
|
|
llsdItem.desc = invItem.Description;
|
|
llsdItem.flags = (int)invItem.Flags;
|
|
llsdItem.item_id = invItem.ID;
|
|
llsdItem.name = invItem.Name;
|
|
llsdItem.parent_id = invItem.Folder;
|
|
llsdItem.type = invItem.AssetType;
|
|
llsdItem.inv_type = invItem.InvType;
|
|
|
|
llsdItem.permissions = new LLSDPermissions();
|
|
llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
|
|
llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
|
|
llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
|
|
llsdItem.permissions.group_id = invItem.GroupID;
|
|
llsdItem.permissions.group_mask = (int)invItem.GroupPermissions;
|
|
llsdItem.permissions.is_owner_group = invItem.GroupOwned;
|
|
llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
|
|
llsdItem.permissions.owner_id = invItem.Owner;
|
|
llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
|
|
llsdItem.sale_info = new LLSDSaleInfo();
|
|
llsdItem.sale_info.sale_price = invItem.SalePrice;
|
|
llsdItem.sale_info.sale_type = invItem.SaleType;
|
|
|
|
return llsdItem;
|
|
}
|
|
}
|
|
}
|