* Started major restructusing of comms to prepare for better grid and region functionality

* Working towards one shared set of services
* Killed off two projects with very little functionality

1 files changed, 27 insertions, 34 deletions

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;