From 4452ed60f8b6956bcbb00353512bf7d7d89ad70c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 23 Jul 2008 21:40:06 +0000
Subject: * refactor: split out inventory services which are only used between
non-region services * more to follow
---
.../Communications/IInterGridInventoryServices.cs | 58 ++++++++++++++++++++++
.../Framework/Communications/IInventoryServices.cs | 24 ++-------
2 files changed, 63 insertions(+), 19 deletions(-)
create mode 100644 OpenSim/Framework/Communications/IInterGridInventoryServices.cs
(limited to 'OpenSim/Framework/Communications')
diff --git a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs b/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
new file mode 100644
index 0000000..1ef1452
--- /dev/null
+++ b/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
@@ -0,0 +1,58 @@
+/*
+ * 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 System.Collections.Generic;
+using libsecondlife;
+
+namespace OpenSim.Framework.Communications
+{
+ ///
+ /// Inventory operations used between grid services.
+ ///
+ public interface IInterGridInventoryServices
+ {
+ string Host
+ {
+ get;
+ }
+
+ ///
+ /// Create a new inventory for the given user.
+ ///
+ ///
+ /// true if the inventory was successfully created, false otherwise
+ bool CreateNewUserInventory(LLUUID user);
+
+ ///
+ /// Returns a list of all the folders in a given user's inventory.
+ ///
+ ///
+ /// A flat list of the user's inventory folder tree,
+ /// null if there is no inventory for this user
+ List GetInventorySkeleton(LLUUID userId);
+ }
+}
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 3929a4e..18e1a2d 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -40,12 +40,8 @@ namespace OpenSim.Framework.Communications
///
/// Defines all the operations one can perform on a user's inventory.
///
- public interface IInventoryServices
- {
- string Host
- {
- get;
- }
+ public interface IInventoryServices : IInterGridInventoryServices
+ {
///
/// Request the inventory for a user. This is an asynchronous operation that will call the callback when the
/// inventory has been received
@@ -104,12 +100,10 @@ namespace OpenSim.Framework.Communications
bool DeleteItem(InventoryItemBase item);
///
- /// Create a new inventory for the given user.
+ /// Does the given user have an inventory structure?
///
- ///
- /// true if the inventory was successfully created, false otherwise
- bool CreateNewUserInventory(LLUUID user);
-
+ ///
+ ///
bool HasInventoryForUser(LLUUID userID);
///
@@ -118,13 +112,5 @@ namespace OpenSim.Framework.Communications
///
/// null if no root folder was found
InventoryFolderBase RequestRootFolder(LLUUID userID);
-
- ///
- /// Returns a list of all the folders in a given user's inventory.
- ///
- ///
- /// A flat list of the user's inventory folder tree,
- /// null if there is no inventory for this user
- List GetInventorySkeleton(LLUUID userId);
}
}
--
cgit v1.1