10 files changed, 21 insertions, 21 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);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 30a41f4..4b4292d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Grid.UserServer
         public UserManager m_userManager;
         public UserLoginService m_loginService;
         public MessageServersConnector m_messagesService;
-        protected IInventoryServices m_inventoryService;
+        protected IInterServiceInventoryServices m_interServiceInventoryService;
 
         private LLUUID m_lastCreatedUser = LLUUID.Random();
 
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer
             m_loginService = new UserLoginService(
                  m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
 
-            m_inventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl);
+            m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl);
             
             m_messagesService = new MessageServersConnector();
 
@@ -196,7 +196,7 @@ namespace OpenSim.Grid.UserServer
 
                     try
                     {                        
-                        if (!m_inventoryService.CreateNewUserInventory(userID))
+                        if (!m_interServiceInventoryService.CreateNewUserInventory(userID))
                         {
                             throw new Exception(
                                 String.Format(
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 3bc3f9a..6793889 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Local
         {
             AddInventoryService(inventoryService);
             m_defaultInventoryHost = inventoryService.Host;
-            m_interGridInventoryService = inventoryService;
+            m_interServiceInventoryService = inventoryService;
             m_userService = userService;
             m_avatarService = (IAvatarService)userService;
             m_gridService = gridService;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 98672c2..bdd32ea 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
                 profile = m_userManager.GetUserProfile(firstname, lastname);
                 if (profile != null)
                 {
-                    m_Parent.InterGridInventoryService.CreateNewUserInventory(profile.ID);
+                    m_Parent.InterServiceInventoryService.CreateNewUserInventory(profile.ID);
                 }
 
                 return profile;
@@ -260,13 +260,13 @@ namespace OpenSim.Region.Communications.Local
         // See LoginService
         protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
         {
-            List<InventoryFolderBase> folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
+            List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
 
             // If we have user auth but no inventory folders for some reason, create a new set of folders.
             if (null == folders || 0 == folders.Count)
             {
-                m_Parent.InterGridInventoryService.CreateNewUserInventory(userID);
-                folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
+                m_Parent.InterServiceInventoryService.CreateNewUserInventory(userID);
+                folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
             }
 
             LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 76791f1..2ee7981 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
         // private readonly NetworkServersInfo m_serversInfo;
         private readonly uint m_defaultHomeX;
         private readonly uint m_defaultHomeY;
-        private IInterGridInventoryServices m_interGridInventoryService;
+        private IInterServiceInventoryServices m_interServiceInventoryService;
 
         /// <summary>
         ///
@@ -48,14 +48,14 @@ namespace OpenSim.Region.Communications.Local
         /// <param name="inventoryService"></param>
         /// <param name="statsCollector">Can be null if stats collection is not required.</param>
         public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
-                                 IInterGridInventoryServices interGridInventoryService)
+                                 IInterServiceInventoryServices interServiceInventoryService)
         {
             // m_serversInfo = serversInfo;
 
             m_defaultHomeX = defaultHomeLocX;
             m_defaultHomeY = defaultHomeLocY;
 
-            m_interGridInventoryService = interGridInventoryService;
+            m_interServiceInventoryService = interServiceInventoryService;
         }
 
         public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local
             }
             else
             {
-                m_interGridInventoryService.CreateNewUserInventory(profile.ID);
+                m_interServiceInventoryService.CreateNewUserInventory(profile.ID);
             }
 
             return profile;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b86d9ea..80c286e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Region.Communications.OGS1
 {
-    public class OGS1InventoryService : IInventoryServices, IInterGridInventoryServices
+    public class OGS1InventoryService : IInventoryServices, IInterServiceInventoryServices
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
index fbfc680..bb94c20 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Region.Communications.OGS1
 {
-    public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices
+    public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);