5 files changed, 12 insertions, 11 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 5fd5524..3bc3f9a 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,8 +44,9 @@ namespace OpenSim.Region.Communications.Local
             IGridServices gridService, bool dumpAssetsToFile)
             : base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
         {
-            AddInventoryService( inventoryService);
+            AddInventoryService(inventoryService);
             m_defaultInventoryHost = inventoryService.Host;
+            m_interGridInventoryService = 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 30a639a..98672c2 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.InventoryService.CreateNewUserInventory(profile.ID);
+                    m_Parent.InterGridInventoryService.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.InventoryService.GetInventorySkeleton(userID);
+            List<InventoryFolderBase> folders = m_Parent.InterGridInventoryService.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.InventoryService.CreateNewUserInventory(userID);
-                folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
+                m_Parent.InterGridInventoryService.CreateNewUserInventory(userID);
+                folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
             }
 
             LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 798dd24..76791f1 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 IInventoryServices m_inventoryService;
+        private IInterGridInventoryServices m_interGridInventoryService;
 
         /// <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,
-                                 IInventoryServices inventoryService)
+                                 IInterGridInventoryServices interGridInventoryService)
         {
             // m_serversInfo = serversInfo;
 
             m_defaultHomeX = defaultHomeLocX;
             m_defaultHomeY = defaultHomeLocY;
 
-            m_inventoryService = inventoryService;
+            m_interGridInventoryService = interGridInventoryService;
         }
 
         public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local
             }
             else
             {
-                m_inventoryService.CreateNewUserInventory(profile.ID);
+                m_interGridInventoryService.CreateNewUserInventory(profile.ID);
             }
 
             return profile;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 05ecfcc..b86d9ea 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
+    public class OGS1InventoryService : IInventoryServices, IInterGridInventoryServices
     {
         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 61c4e06..fbfc680 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
+    public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);