* Trying to streamline CommunicationsManager

3 files changed, 17 insertions, 22 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e5abb2e..2a87306 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -37,18 +37,18 @@ namespace OpenSim.Framework.Communications
 {
     public class CommunicationsManager
     {
-        private AssetCache m_assetCache;
-        private IGridServices m_gridServer;
-        private IInterRegionCommunications m_interRegion;
-        private IInventoryServices m_inventoryServer;
-        private AssetTransactionManager m_transactionsManager;
-        private UserProfileCache m_userProfiles;
-        private IUserServices m_userServer;
-        private NetworkServersInfo m_networkServersInfo;
+        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)
         {
-            this.m_networkServersInfo = serversInfo;
+            m_networkServersInfo = serversInfo;
             m_assetCache = assetCache;
             m_userProfiles = new UserProfileCache(this);
             m_transactionsManager = new AssetTransactionManager(this);
@@ -63,7 +63,6 @@ namespace OpenSim.Framework.Communications
         public IGridServices GridServer
         {
             get { return m_gridServer; }
-            set { m_gridServer = value; }
         }
 
         public IInventoryServices InventoryServer
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index aa0105c..15167fb 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -60,15 +60,15 @@ namespace OpenSim.Region.Communications.Local
 
             InvenServices = new LocalInventoryService();
             InvenServices.AddPlugin(m_settings.InventoryPlugin);
-            InventoryServer = InvenServices;
+            m_inventoryServer = InvenServices;
 
             UserServices = new LocalUserServices(this, serversInfo);
             UserServices.AddPlugin(m_settings.UserDatabasePlugin);
-            UserServer = UserServices;
+            m_userServer = UserServices;
 
             InstanceServices = new LocalBackEndServices();
-            GridServer = InstanceServices;
-            InterRegion = InstanceServices;
+            m_gridServer = InstanceServices;
+            m_interRegion = InstanceServices;
 
             //CapsServices = new CAPSService(httpServer);
 
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index dd85d54..ca9c34b 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -8,18 +8,14 @@ namespace OpenSim.Region.Communications.OGS1
 {
     public class CommunicationsOGS1 : CommunicationsManager
     {
-        public OGS1InventoryService InvenService;
-
         public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
         {
             OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
-            GridServer = gridInterComms;
-            InterRegion = gridInterComms;
-
-            InvenService = new OGS1InventoryService();
-            InventoryServer = InvenService;
+            m_gridServer = gridInterComms;
+            m_interRegion = gridInterComms;
 
-            UserServer = new OGS1UserServices(this);
+            m_inventoryServer = new OGS1InventoryService();
+            m_userServer = new OGS1UserServices(this);
         }
     }
 }