* Trying to streamline CommunicationsManager

2 files changed, 8 insertions, 12 deletions

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);
         }
     }
 }