From e12981ef1be8a424a975f8976d43245de868efb9 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 11 Feb 2009 19:29:59 +0000
Subject: * Establish a common InventoryNodeBase class from InventoryItemBase
and InventoryFolderBase
---
OpenSim/Framework/InventoryFolderBase.cs | 35 +----------
OpenSim/Framework/InventoryItemBase.cs | 34 +----------
OpenSim/Framework/InventoryNodeBase.cs | 67 ++++++++++++++++++++++
.../Inventory/Archiver/InventoryArchiverModule.cs | 11 ++++
4 files changed, 81 insertions(+), 66 deletions(-)
create mode 100644 OpenSim/Framework/InventoryNodeBase.cs
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index e55f834..a6e249e 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -32,24 +32,9 @@ namespace OpenSim.Framework
///
/// A Class for folders which contain users inventory
///
- public class InventoryFolderBase
+ public class InventoryFolderBase : InventoryNodeBase
{
///
- /// The UUID for this folder
- ///
- private UUID _id;
-
- ///
- /// The name of the folder (64 characters or less)
- ///
- private string _name;
-
- ///
- /// The agent who's inventory this is contained by
- ///
- private UUID _owner;
-
- ///
/// The folder this folder is contained in
///
private UUID _parentID;
@@ -66,30 +51,12 @@ namespace OpenSim.Framework
///
private ushort _version;
- public virtual string Name
- {
- get { return _name; }
- set { _name = value; }
- }
-
- public virtual UUID Owner
- {
- get { return _owner; }
- set { _owner = value; }
- }
-
public virtual UUID ParentID
{
get { return _parentID; }
set { _parentID = value; }
}
- public virtual UUID ID
- {
- get { return _id; }
- set { _id = value; }
- }
-
public virtual short Type
{
get { return _type; }
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index cd96e01..ecc2d76 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
///
/// Inventory Item - contains all the properties associated with an individual inventory piece.
///
- public class InventoryItemBase
+ public class InventoryItemBase : InventoryNodeBase
{
///
/// The UUID of the associated asset on the asset server
@@ -55,8 +55,6 @@ namespace OpenSim.Framework
///
private UUID _creator;
- private UUID _owner;
-
private uint _nextPermissions;
///
@@ -85,22 +83,11 @@ namespace OpenSim.Framework
private UUID _folder;
///
- /// A UUID containing the ID for the inventory item itself
- ///
- private UUID _id;
-
- ///
- /// The type of inventory item. (Can be slightly different to the asset type
+ /// The inventory type of the item. This is slightly different from the asset type in some situations.
///
private int _invType;
///
- /// The name of the inventory item (must be less than 64 characters)
- ///
- private string _name;
-
-
- ///
///
///
private UUID _groupID;
@@ -130,11 +117,6 @@ namespace OpenSim.Framework
///
private int _creationDate;
- public UUID ID {
- get { return _id; }
- set { _id = value; }
- }
-
public int InvType
{
get { return _invType; }
@@ -147,24 +129,12 @@ namespace OpenSim.Framework
set { _folder = value; }
}
- public UUID Owner
- {
- get { return _owner; }
- set { _owner = value; }
- }
-
public UUID Creator
{
get { return _creator; }
set { _creator = value; }
}
- public string Name
- {
- get { return _name; }
- set { _name = value; }
- }
-
public string Description
{
get { return _description; }
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
new file mode 100644
index 0000000..6f61ab5
--- /dev/null
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -0,0 +1,67 @@
+/*
+ * 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 OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ ///
+ /// Common base class for inventory nodes of different types (files, folders, etc.)
+ ///
+ public class InventoryNodeBase
+ {
+ ///
+ /// The name of the node (64 characters or less)
+ ///
+ public virtual string Name
+ {
+ get { return m_name; }
+ set { m_name = value; }
+ }
+ private string m_name;
+
+ ///
+ /// A UUID containing the ID for the inventory node itself
+ ///
+ public UUID ID
+ {
+ get { return m_id; }
+ set { m_id = value; }
+ }
+ private UUID m_id;
+
+ ///
+ /// The agent who's inventory this is contained by
+ ///
+ public virtual UUID Owner
+ {
+ get { return m_owner; }
+ set { m_owner = value; }
+ }
+ private UUID m_owner;
+ }
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 0c489e5..ab914c4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -114,6 +114,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
new InventoryArchiveReadRequest(firstName, lastName, invPath, loadPath, m_commsManager).Execute();
}
+
+ /*
+ foreach (Scene scene in m_scenes.Values)
+ {
+ ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
+ if (user != null && !user.IsChildAgent)
+ {
+ user.ControllingClient.SendBulkUpdateInventory(folderCopy);
+ }
+ }
+ */
}
public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath)
--
cgit v1.1