From b618802e533ce2922e1e1a2f5d2b35b891e9ae88 Mon Sep 17 00:00:00 2001 From: MW Date: Sat, 16 Feb 2008 13:01:42 +0000 Subject: Moved the AgentAssetTransactionsManager (and AgentAssetTransactions) out of CommsManager and into a module (AgentAgentTransactionModule), still needs cleaning up though. But its one more thing out of the CommsManager. One day we will kill the CommsManager! --- .../Framework/Communications/Cache/AgentAssetTransactions.cs | 3 +++ .../Communications/Cache/AgentAssetTransactionsManager.cs | 5 ++++- OpenSim/Framework/Communications/CommunicationsManager.cs | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs index 3882ade..4aefe83 100644 --- a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs @@ -25,6 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ +//moved to a module, left here until the module is found to have no problems +/* using System; using System.Collections.Generic; using System.IO; @@ -553,3 +555,4 @@ namespace OpenSim.Framework.Communications.Cache #endregion } } +*/ \ No newline at end of file diff --git a/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs b/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs index bb523f4..97b716c 100644 --- a/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs +++ b/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs @@ -26,6 +26,8 @@ * */ +//moved to a module, left here until the module is found to have no problems +/* using System; using System.Collections.Generic; @@ -181,7 +183,7 @@ namespace OpenSim.Framework.Communications.Cache //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count); }*/ - } + /* } } } @@ -201,3 +203,4 @@ namespace OpenSim.Framework.Communications.Cache } } } +*/ \ No newline at end of file diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 3e72d89..eb820c1 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -73,12 +73,12 @@ namespace OpenSim.Framework.Communications get { return m_userProfileCacheService; } } - protected AgentAssetTransactionsManager m_transactionsManager; + // protected AgentAssetTransactionsManager m_transactionsManager; - public AgentAssetTransactionsManager TransactionsManager - { - get { return m_transactionsManager; } - } + // public AgentAssetTransactionsManager TransactionsManager + // { + // get { return m_transactionsManager; } + // } protected AssetCache m_assetCache; @@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications m_networkServersInfo = serversInfo; m_assetCache = assetCache; m_userProfileCacheService = new UserProfileCacheService(this); - m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile); + // m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile); } public void doCreate(string[] cmmdParams) -- cgit v1.1