* minor: Rename IInterGridInventoryServices since it's inter service rather than inter grid

4 files changed, 7 insertions, 7 deletions

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/IInterServiceInventoryServices.cs
index e820c5e..24213f2 100644
--- a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Communications
     /// <summary>
     /// Inventory operations used between grid services.
     /// </summary>    
-    public interface IInterGridInventoryServices
+    public interface IInterServiceInventoryServices
     {        
         /// <summary>
         /// Create a new inventory for the given user.
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);