diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchLib2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchLib2Handler.cs deleted file mode 100644 index 264c41d813..0000000000 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchLib2Handler.cs +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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.Reflection; -using System.Text; -using OpenMetaverse; -using OpenMetaverse.StructuredData; -using OpenSim.Framework; -using OpenSim.Framework.Capabilities; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Services.Interfaces; -using OSDArray = OpenMetaverse.StructuredData.OSDArray; -using OSDMap = OpenMetaverse.StructuredData.OSDMap; - -using log4net; - -namespace OpenSim.Capabilities.Handlers -{ - public class FetchLib2Handler - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - private IInventoryService m_inventoryService; - private ILibraryService m_LibraryService; - private UUID m_agentID; - private UUID libOwner; - - public FetchLib2Handler(IInventoryService invService, ILibraryService libraryService, UUID agentId) - { - m_inventoryService = invService; - m_agentID = agentId; - m_LibraryService = libraryService; - if(libraryService != null) - libOwner = m_LibraryService.LibraryRootFolder.Owner; - } - - public string FetchLibRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) - { - //m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capability request {0}", request); - - if (m_LibraryService == null || m_agentID == UUID.Zero) - return "items"; - - OSDMap requestmap = (OSDMap)OSDParser.DeserializeLLSDXml(Utils.StringToBytes(request)); - OSDArray itemsRequested = (OSDArray)requestmap["items"]; - - UUID[] itemIDs = new UUID[itemsRequested.Count]; - int i = 0; - - foreach (OSDMap osdItemId in itemsRequested) - itemIDs[i++] = osdItemId["item_id"].AsUUID(); - - InventoryItemBase[] items = null; - -// items = m_inventoryService.GetMultipleItems(libOwner, itemIDs); - items = m_LibraryService.GetMultipleItems(itemIDs); - - StringBuilder lsl = LLSDxmlEncode.Start(2048); - LLSDxmlEncode.AddMap(lsl); - LLSDxmlEncode.AddElem("agent_id", m_agentID, lsl); - if(items == null || items.Length == 0) - { - LLSDxmlEncode.AddEmptyArray("items", lsl); - } - else - { - LLSDxmlEncode.AddArray("items", lsl); - foreach (InventoryItemBase item in items) - { - if (item != null) - item.ToLLSDxml(lsl); - } - LLSDxmlEncode.AddEndArray(lsl); - } - - LLSDxmlEncode.AddEndMap(lsl); - return LLSDxmlEncode.End(lsl);; - } - } -} diff --git a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs index 0ea4bdb30a..eef94354c8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs @@ -47,14 +47,12 @@ namespace OpenSim.Region.ClientStack.Linden // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public bool Enabled { get; private set; } - private bool m_enabledLib; private Scene m_scene; private IInventoryService m_inventoryService; private ILibraryService m_LibraryService; private string m_fetchInventory2Url; - private string m_fetchLib2Url; #region ISharedRegionModule Members @@ -65,12 +63,9 @@ namespace OpenSim.Region.ClientStack.Linden return; m_fetchInventory2Url = config.GetString("Cap_FetchInventory2", string.Empty); - m_fetchLib2Url = config.GetString("Cap_FetchLib2", "localhost"); if (m_fetchInventory2Url != string.Empty) Enabled = true; - if (m_fetchInventory2Url != string.Empty) - m_enabledLib = true; } public void AddRegion(Scene s) @@ -116,8 +111,6 @@ namespace OpenSim.Region.ClientStack.Linden private void RegisterCaps(UUID agentID, Caps caps) { RegisterFetchCap(agentID, caps, "FetchInventory2", m_fetchInventory2Url); - if(m_enabledLib) - RegisterFetchLibCap(agentID, caps, "FetchLib2", m_fetchLib2Url); } private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url) @@ -143,34 +136,6 @@ namespace OpenSim.Region.ClientStack.Linden caps.RegisterHandler(capName, capUrl); } -// m_log.DebugFormat( -// "[FETCH INVENTORY2 MODULE]: Registered capability {0} at {1} in region {2} for {3}", -// capName, capUrl, m_scene.RegionInfo.RegionName, agentID); - } - - private void RegisterFetchLibCap(UUID agentID, Caps caps, string capName, string url) - { - string capUrl; - - if (url == "localhost") - { - capUrl = "/CAPS/" + UUID.Random(); - - FetchLib2Handler fetchHandler = new FetchLib2Handler(m_inventoryService, m_LibraryService, agentID); - - IRequestHandler reqHandler - = new RestStreamHandler( - "POST", capUrl, fetchHandler.FetchLibRequest, capName, agentID.ToString()); - - caps.RegisterHandler(capName, reqHandler); - } - else - { - capUrl = url; - - caps.RegisterHandler(capName, capUrl); - } - // m_log.DebugFormat( // "[FETCH INVENTORY2 MODULE]: Registered capability {0} at {1} in region {2} for {3}", // capName, capUrl, m_scene.RegionInfo.RegionName, agentID); diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d96ab4fa9a..51f6c9c1a5 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -844,11 +844,6 @@ Cap_FetchInventoryDescendents2 = "localhost" Cap_FetchInventory2 = "localhost" - ; do uncomment Cap_FetchLib2 for now - ; Current viewers do not suport it for opensim. - ; in same requests they use a hard coded ll library owner id. - ;Cap_FetchLib2 = "localhost" - ; Capability for searching for people Cap_AvatarPickerSearch = "localhost"