* Encapsulated all CommunicationsManager services

OpenSim/Framework/Communications/Cache/AssetCache.cs

@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 
-namespace OpenSim.Framework.Communications.Caches
+namespace OpenSim.Framework.Communications.Cache
 {
     public delegate void DownloadComplete(AssetCache.TextureSender sender);
 
@@ -792,4 +792,3 @@ namespace OpenSim.Framework.Communications.Caches
         }
     }
 }
-

OpenSim/Framework/Communications/Capabilities/Caps.cs

@@ -31,10 +31,10 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using libsecondlife;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Data;
 
 namespace OpenSim.Region.Capabilities

OpenSim/Framework/Communications/CommunicationsManager.cs

@@ -28,6 +28,7 @@
 using System.Text;
 using libsecondlife;
 using libsecondlife.Packets;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
@@ -40,33 +41,80 @@ namespace OpenSim.Framework.Communications
  
     public class CommunicationsManager
     {
-        public IUserServices UserServer;
-        public IGridServices GridServer;
-        public IInventoryServices InventoryServer;
-        public IInterRegionCommunications InterRegion;
-        public UserProfileCache UserProfiles;
-        public AssetTransactionManager TransactionsManager;
-        public AssetCache AssetCache;
-
-        public NetworkServersInfo ServersInfo;
         public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
         {
-            ServersInfo = serversInfo;
+            this.serversInfo = serversInfo;
-            this.AssetCache = assetCache;
+            this.m_assetCache = assetCache;
-            UserProfiles = new UserProfileCache(this);
+            m_userProfiles = new UserProfileCache(this);
-            TransactionsManager = new AssetTransactionManager(this);
+            m_transactionsManager = new AssetTransactionManager(this);
+        }
+
+        private IUserServices m_userServer;
+        public IUserServices UserServer
+        {
+            get { return m_userServer; }
+            set { m_userServer = value; }
+        }
+
+        private IGridServices m_gridServer;
+        public IGridServices GridServer
+        {
+            get { return m_gridServer; }
+            set { m_gridServer = value; }
+        }
+
+        private IInventoryServices m_inventoryServer;
+        public IInventoryServices InventoryServer
+        {
+            get { return m_inventoryServer; }
+            set { m_inventoryServer = value; }
+        }
+
+        private IInterRegionCommunications m_interRegion;
+        public IInterRegionCommunications InterRegion
+        {
+            get { return m_interRegion; }
+            set { m_interRegion = value; }
+        }
+
+        private UserProfileCache m_userProfiles;
+        public UserProfileCache UserProfiles
+        {
+            get { return m_userProfiles; }
+            set { m_userProfiles = value; }
+        }
+
+        private AssetTransactionManager m_transactionsManager;
+        public AssetTransactionManager TransactionsManager
+        {
+            get { return m_transactionsManager; }
+            set { m_transactionsManager = value; }
+        }
+
+        private AssetCache m_assetCache;
+        public AssetCache AssetCache
+        {
+            get { return m_assetCache; }
+            set { m_assetCache = value; }
+        }
+
+        private NetworkServersInfo serversInfo;
+        public NetworkServersInfo ServersInfo
+        {
+            get { return serversInfo; }
+            set { serversInfo = value; }
         }
 
         #region Packet Handlers
         public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
         {
-            if (uuid == UserProfiles.libraryRoot.agentID)
+            if (uuid == m_userProfiles.libraryRoot.agentID)
             {
                 remote_client.SendNameReply(uuid , "Mr" , "OpenSim");
             }
             else
             {
-                UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
+                UserProfileData profileData = this.m_userServer.GetUserProfile(uuid);
                 if (profileData != null)
                 {
                     LLUUID profileId = profileData.UUID;

OpenSim/Region/Application/OpenSimMain.cs

@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Nini.Config;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
@@ -270,7 +271,7 @@ namespace OpenSim
             }
             assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
             m_assetCache = new AssetCache(assetServer);
-            // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
+            // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
         }
 
         protected override LogBase CreateLog()

OpenSim/Region/ClientStack/ClientView.cs

@@ -34,13 +34,12 @@ using System.Timers;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Communications.Caches;
-
 using Timer = System.Timers.Timer;
 
 namespace OpenSim.Region.ClientStack

OpenSim/Region/ClientStack/PacketServer.cs

@@ -30,9 +30,9 @@ using System.Net;
 using System.Net.Sockets;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Communications.Caches;
 using libsecondlife;
 
 namespace OpenSim.Region.ClientStack

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
@@ -39,7 +40,6 @@ using OpenSim.Region.Environment;
 using libsecondlife;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Caches;
 
 namespace OpenSim.Region.ClientStack
 {

OpenSim/Region/ClientStack/UDPServer.cs

@@ -31,10 +31,10 @@ using System.Net;
 using System.Net.Sockets;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Communications.Caches;
 
 namespace OpenSim.Region.ClientStack
 {

OpenSim/Region/Communications/Local/CommunicationsLocal.cs

@@ -27,9 +27,9 @@
 */
 using System;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Data;

OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs

@@ -1,7 +1,7 @@
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications.Caches;
 
 
 namespace OpenSim.Region.Communications.OGS1

OpenSim/Region/Communications/OGS1/OGS1GridServices.cs

@@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.OGS1
             return new XmlRpcResponse();
         }
 
-        #region InterRegion Comms
+        #region m_interRegion Comms
         /// <summary>
         /// 
         /// </summary>

OpenSim/Region/Environment/Scenes/Scene.cs

@@ -35,7 +35,7 @@ using Axiom.Math;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Caches;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;

OpenSim/Region/Environment/Scenes/SceneBase.cs

@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Framework.Communications.Caches;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs

@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public LLVector3 AbsolutePosition
+        public override LLVector3 AbsolutePosition
         {
             get { return m_rootPart.GroupPosition; }
             set

OpenSim/Region/Environment/Scenes/ScenePresence.cs

@@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_controllingClient; }
         }
 
-        public LLVector3 AbsolutePosition
+        public override LLVector3 AbsolutePosition
         {
             get
             {
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }        
       
-        public LLVector3 Velocity
+        public override LLVector3 Velocity
         {
             get
             {

OpenSim/Region/Examples/SimpleApp/MyWorld.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
@@ -9,8 +10,6 @@ using OpenSim.Framework.Types;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
 using OpenSim.Region.Environment;
-using OpenSim.Framework.Communications.Caches;
-
 using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
 
 namespace SimpleApp

OpenSim/Region/Examples/SimpleApp/Program.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using libsecondlife;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;