3 files changed, 68 insertions, 21 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0fadb85..4ae8595 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/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);
 
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Communications.Caches
 
         public void DeleteAsset(LLUUID assetID)
         {
-          //  this._assetServer.DeleteAsset(assetID);
+            //  this._assetServer.DeleteAsset(assetID);
 
             //Todo should delete it from memory too
         }
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Communications.Caches
             if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
             {
                 this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
-              // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
+                // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
             }
         }
 
@@ -791,5 +791,4 @@ namespace OpenSim.Framework.Communications.Caches
             }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index f9c8b47..59c6d7c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/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
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6d73af8..d6a577f 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/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.AssetCache = assetCache;
-            UserProfiles = new UserProfileCache(this);
-            TransactionsManager = new AssetTransactionManager(this);
+            this.serversInfo = serversInfo;
+            this.m_assetCache = assetCache;
+            m_userProfiles = new UserProfileCache(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;