From f86c438653fc3c8356a8f0c43a055b1928183f02 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 29 Nov 2010 08:43:33 -0800
Subject: Preservation of creator information now also working in IARs. Cleaned
up usage help. Moved Osp around, deleted unnecessary
OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in
a generic ExternalRepresentationUtils function.
---
.../Osp/OspInventoryWrapperPlugin.cs | 104 ---------------------
1 file changed, 104 deletions(-)
delete mode 100644 OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
(limited to 'OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs')
diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
deleted file mode 100644
index bcd1eee..0000000
--- a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.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.Collections.Generic;
-using OpenSim.Data;
-using OpenMetaverse;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Framework.Communications.Osp
-{
- ///
- /// Wrap other inventory data plugins so that we can perform OSP related post processing for items
- ///
- public class OspInventoryWrapperPlugin : IInventoryDataPlugin
- {
- protected IInventoryDataPlugin m_wrappedPlugin;
- //protected CommunicationsManager m_commsManager;
- protected IUserAccountService m_userAccountService;
-
- public OspInventoryWrapperPlugin(IInventoryDataPlugin wrappedPlugin, IUserAccountService userService)
- {
- m_wrappedPlugin = wrappedPlugin;
- m_userAccountService = userService;
- }
-
- public string Name { get { return "OspInventoryWrapperPlugin"; } }
- public string Version { get { return "0.1"; } }
- public void Initialise() {}
- public void Initialise(string connect) {}
- public void Dispose() {}
-
- public InventoryItemBase getInventoryItem(UUID item)
- {
- return PostProcessItem(m_wrappedPlugin.getInventoryItem(item));
- }
-
- // XXX: Why on earth does this exist as it appears to duplicate getInventoryItem?
- public InventoryItemBase queryInventoryItem(UUID item)
- {
- return PostProcessItem(m_wrappedPlugin.queryInventoryItem(item));
- }
-
- public List getInventoryInFolder(UUID folderID)
- {
- List items = m_wrappedPlugin.getInventoryInFolder(folderID);
-
- foreach (InventoryItemBase item in items)
- PostProcessItem(item);
-
- return items;
- }
-
- public List fetchActiveGestures(UUID avatarID)
- {
- return m_wrappedPlugin.fetchActiveGestures(avatarID);
-
- // Presuming that no post processing is needed here as gestures don't refer to creator information (?)
- }
-
- protected InventoryItemBase PostProcessItem(InventoryItemBase item)
- {
- item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_userAccountService);
- return item;
- }
-
- public List getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); }
- public List getUserRootFolders(UUID user) { return m_wrappedPlugin.getUserRootFolders(user); }
- public InventoryFolderBase getUserRootFolder(UUID user) { return m_wrappedPlugin.getUserRootFolder(user); }
- public List getInventoryFolders(UUID parentID) { return m_wrappedPlugin.getInventoryFolders(parentID); }
- public InventoryFolderBase getInventoryFolder(UUID folder) { return m_wrappedPlugin.getInventoryFolder(folder); }
- public void addInventoryItem(InventoryItemBase item) { m_wrappedPlugin.addInventoryItem(item); }
- public void updateInventoryItem(InventoryItemBase item) { m_wrappedPlugin.updateInventoryItem(item); }
- public void deleteInventoryItem(UUID item) { m_wrappedPlugin.deleteInventoryItem(item); }
- public InventoryFolderBase queryInventoryFolder(UUID folder) { return m_wrappedPlugin.queryInventoryFolder(folder); }
- public void addInventoryFolder(InventoryFolderBase folder) { m_wrappedPlugin.addInventoryFolder(folder); }
- public void updateInventoryFolder(InventoryFolderBase folder) { m_wrappedPlugin.updateInventoryFolder(folder); }
- public void moveInventoryFolder(InventoryFolderBase folder) { m_wrappedPlugin.moveInventoryFolder(folder); }
- public void deleteInventoryFolder(UUID folder) { m_wrappedPlugin.deleteInventoryFolder(folder); }
- }
-}
--
cgit v1.1