From 29e8fcd13c99606813c916c4d464372572af230f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 24 Jul 2008 15:20:57 +0000
Subject: * minor: Rename IInterGridInventoryServices since it's inter service
 rather than inter grid

---
 .../Communications/CommunicationsManager.cs        |  8 ++--
 .../Communications/IInterGridInventoryServices.cs  | 53 ----------------------
 .../IInterServiceInventoryServices.cs              | 53 ++++++++++++++++++++++
 .../Framework/Communications/IInventoryServices.cs |  2 +-
 .../Communications/InventoryServiceBase.cs         |  2 +-
 5 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 OpenSim/Framework/Communications/IInterGridInventoryServices.cs
 create mode 100644 OpenSim/Framework/Communications/IInterServiceInventoryServices.cs

(limited to 'OpenSim/Framework/Communications')

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6272872..3659d86 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -88,11 +88,11 @@ namespace OpenSim.Framework.Communications
         }
         protected AssetCache m_assetCache;                
         
-        public IInterGridInventoryServices InterGridInventoryService
+        public IInterServiceInventoryServices InterServiceInventoryService
         {
-            get { return m_interGridInventoryService; }
+            get { return m_interServiceInventoryService; }
         }        
-        protected IInterGridInventoryServices m_interGridInventoryService;
+        protected IInterServiceInventoryServices m_interServiceInventoryService;
 
         public NetworkServersInfo NetworkServersInfo
         {
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications
             }
             else
             {
-                InventoryService.CreateNewUserInventory(userProf.ID);
+                InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
                 m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
                 return userProf.ID;
             }
diff --git a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs b/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
deleted file mode 100644
index e820c5e..0000000
--- a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
+++ /dev/null
@@ -1,53 +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 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
-{
-    /// <summary>
-    /// Inventory operations used between grid services.
-    /// </summary>    
-    public interface IInterGridInventoryServices
-    {        
-        /// <summary>
-        /// Create a new inventory for the given user.
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns>true if the inventory was successfully created, false otherwise</returns>
-        bool CreateNewUserInventory(LLUUID user);
-        
-        /// <summary>
-        /// Returns a list of all the folders in a given user's inventory.
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns>A flat list of the user's inventory folder tree,
-        /// null if there is no inventory for this user</returns>
-        List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);        
-    }
-}
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
new file mode 100644
index 0000000..24213f2
--- /dev/null
+++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
@@ -0,0 +1,53 @@
+/*
+ * 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
+{
+    /// <summary>
+    /// Inventory operations used between grid services.
+    /// </summary>    
+    public interface IInterServiceInventoryServices
+    {        
+        /// <summary>
+        /// Create a new inventory for the given user.
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns>true if the inventory was successfully created, false otherwise</returns>
+        bool CreateNewUserInventory(LLUUID user);
+        
+        /// <summary>
+        /// Returns a list of all the folders in a given user's inventory.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns>A flat list of the user's inventory folder tree,
+        /// null if there is no inventory for this user</returns>
+        List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);        
+    }
+}
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index bb16a49..08a2c5f 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications
     /// <summary>
     /// Defines all the operations one can perform on a user's inventory.
     /// </summary>
-    public interface IInventoryServices : IInterGridInventoryServices
+    public interface IInventoryServices
     {        
         string Host
         {
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index fd2e6b1..06b707b 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications
     /// <summary>
     /// Abstract base class used by local and grid implementations of an inventory service.
     /// </summary>
-    public abstract class InventoryServiceBase : IInventoryServices, IInterGridInventoryServices
+    public abstract class InventoryServiceBase : IInventoryServices, IInterServiceInventoryServices
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-- 
cgit v1.1