11 files changed, 60 insertions, 45 deletions

diff --git a/OpenSim/Framework/UserManager/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index a8eac26..a8eac26 100644
--- a/OpenSim/Framework/UserManager/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index 59a9e00..d0507d0 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications.Caches
             {
                 //really need to fix this call, if lbsa71 saw this he would die. 
                 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
-                CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId);
+                CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId);
                 if (userInfo != null)
                 {
                     InventoryItemBase item = new InventoryItemBase();
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index acdb6db..99dc45a 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Caches
             if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
             {
                 this.ItemReceive(userID, itemInfo);
-                this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo);
+                this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
             }
         }
 
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Communications.Caches
         {
             if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
             {
-                this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo);
+                this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
             }
         }
 
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Communications.Caches
                 result = RootFolder.DeleteItem(item.inventoryID);
                 if (result)
                 {
-                    this.m_parentCommsManager.InventoryServer.DeleteInventoryItem(userID, item);
+                    this.m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item);
                 }
             }
             return result;
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 0c8c0f9..390b938 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Caches
                        InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
                        if (createdFolder != null)
                        {
-                           this.m_parent.InventoryServer.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
+                           this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
                        }
                     }
                     else
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Communications.Caches
         /// <param name="userID"></param>
         private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
         {
-             this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
+             this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
         }
 
         /// <summary>
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Caches
         /// <param name="userID"></param>
         private UserProfileData RequestUserProfileForUser(LLUUID userID)
         {
-            return this.m_parent.UserServer.GetUserProfile(userID);
+            return this.m_parent.UserService.GetUserProfile(userID);
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 2a87306..6ea3c29 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -37,81 +37,74 @@ namespace OpenSim.Framework.Communications
 {
     public class CommunicationsManager
     {
-        protected AssetCache m_assetCache;
-        protected IGridServices m_gridServer;
-        protected IInterRegionCommunications m_interRegion;
-        protected IInventoryServices m_inventoryServer;
-        protected AssetTransactionManager m_transactionsManager;
-        protected UserProfileCache m_userProfiles;
-        protected IUserServices m_userServer;
-        protected NetworkServersInfo m_networkServersInfo;
-
-        public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
-        {
-            m_networkServersInfo = serversInfo;
-            m_assetCache = assetCache;
-            m_userProfiles = new UserProfileCache(this);
-            m_transactionsManager = new AssetTransactionManager(this);
-        }
-
-        public IUserServices UserServer
+        protected IUserServices m_userService;
+        public IUserServices UserService
         {
-            get { return m_userServer; }
-            set { m_userServer = value; }
+            get { return m_userService; }
         }
 
-        public IGridServices GridServer
+        protected IGridServices m_gridService;
+        public IGridServices GridService
         {
-            get { return m_gridServer; }
+            get { return m_gridService; }
         }
 
-        public IInventoryServices InventoryServer
+        protected IInventoryServices m_inventoryService;
+        public IInventoryServices InventoryService
         {
-            get { return m_inventoryServer; }
-            set { m_inventoryServer = value; }
+            get { return m_inventoryService; }
         }
 
+        protected IInterRegionCommunications m_interRegion;
         public IInterRegionCommunications InterRegion
         {
             get { return m_interRegion; }
-            set { m_interRegion = value; }
         }
 
-        public UserProfileCache UserProfiles
+        protected UserProfileCache m_userProfileCache;
+        public UserProfileCache UserProfileCache
         {
-            get { return m_userProfiles; }
-            set { m_userProfiles = value; }
+            get { return m_userProfileCache; }
         }
 
+        protected AssetTransactionManager m_transactionsManager;
         public AssetTransactionManager TransactionsManager
         {
             get { return m_transactionsManager; }
-            set { m_transactionsManager = value; }
         }
 
+        protected AssetCache m_assetCache;
         public AssetCache AssetCache
         {
             get { return m_assetCache; }
-            set { m_assetCache = value; }
         }
 
+        protected NetworkServersInfo m_networkServersInfo;
         public NetworkServersInfo NetworkServersInfo
         {
             get { return m_networkServersInfo; }
-            set { m_networkServersInfo = value; }
         }
 
+        public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
+        {
+            m_networkServersInfo = serversInfo;
+            m_assetCache = assetCache;
+            m_userProfileCache = new UserProfileCache(this);
+            m_transactionsManager = new AssetTransactionManager(this);
+        }
+
+
         #region Packet Handlers
 
         public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
         {
-            if (uuid == m_userProfiles.libraryRoot.agentID)
+            if (uuid == m_userProfileCache.libraryRoot.agentID)
             {
                 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
             }
             else
             {
-                UserProfileData profileData = m_userServer.GetUserProfile(uuid);
+                UserProfileData profileData = m_userService.GetUserProfile(uuid);
                 if (profileData != null)
                 {
                     LLUUID profileId = profileData.UUID;
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index bd58756..80c2e64 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -17,5 +17,13 @@ namespace OpenSim.Framework.Communications
         void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
         void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
         void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
+        void CreateNewUserInventory(LLUUID user);
+
+        /// <summary>
+        /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
     }
 }
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index c1bea48..13dd378 100644
--- a/OpenSim/Framework/Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -40,5 +40,10 @@ namespace OpenSim.Framework.Communications
         UserProfileData SetupMasterUser(string firstName, string lastName);
         UserProfileData SetupMasterUser(string firstName, string lastName, string password);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="user"></param>
+        void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
     }
 }
diff --git a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index d76fac5..da7a0ce 100644
--- a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -2,12 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using libsecondlife;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
+using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
 
-namespace OpenSim.Framework.InventoryServiceBase
+namespace OpenSim.Framework.Communications
 {
-    public class InventoryServiceBase
+    public abstract class InventoryServiceBase : IInventoryServices
     {
         protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
         //protected IAssetServer m_assetServer;
@@ -200,5 +202,10 @@ namespace OpenSim.Framework.InventoryServiceBase
                 Folders.Add(folder.folderID, folder);
             }
         }
+
+        public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);
+        public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
+        public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
+        public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index b5a4184..b5a4184 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
diff --git a/OpenSim/Framework/UserManager/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 8e7cf80..8e7cf80 100644
--- a/OpenSim/Framework/UserManager/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 4a2870b..d1bbde1 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using System.Security.Cryptography;
 using libsecondlife;
 using Nwc.XmlRpc;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.Configuration;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
@@ -40,7 +41,7 @@ using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.UserManagement
 {
-    public abstract class UserManagerBase
+    public abstract class UserManagerBase : IUserServices
     {
         public UserConfig _config;
         Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
@@ -372,6 +373,7 @@ namespace OpenSim.Framework.UserManagement
             }
         }
 
-        // Rest and XML-RPC methods. (have moved them to a sub class in the user server)
+        public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
+        public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
     }
 }