diff options
author | MW | 2008-02-16 13:01:42 +0000 |
---|---|---|
committer | MW | 2008-02-16 13:01:42 +0000 |
commit | b618802e533ce2922e1e1a2f5d2b35b891e9ae88 (patch) | |
tree | 0a315205fd0ac0061a7d4b3aa92da9c2c06fcdb7 /OpenSim/Framework | |
parent | Some changes to remove some of the direct calls to CommsManager from Scene, s... (diff) | |
download | opensim-SC-b618802e533ce2922e1e1a2f5d2b35b891e9ae88.zip opensim-SC-b618802e533ce2922e1e1a2f5d2b35b891e9ae88.tar.gz opensim-SC-b618802e533ce2922e1e1a2f5d2b35b891e9ae88.tar.bz2 opensim-SC-b618802e533ce2922e1e1a2f5d2b35b891e9ae88.tar.xz |
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!
Diffstat (limited to 'OpenSim/Framework')
3 files changed, 13 insertions, 7 deletions
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 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | //moved to a module, left here until the module is found to have no problems | ||
29 | /* | ||
28 | using System; | 30 | using System; |
29 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
30 | using System.IO; | 32 | using System.IO; |
@@ -553,3 +555,4 @@ namespace OpenSim.Framework.Communications.Cache | |||
553 | #endregion | 555 | #endregion |
554 | } | 556 | } |
555 | } | 557 | } |
558 | */ \ 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 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | //moved to a module, left here until the module is found to have no problems | ||
30 | /* | ||
29 | using System; | 31 | using System; |
30 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
31 | 33 | ||
@@ -181,7 +183,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
181 | 183 | ||
182 | //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count); | 184 | //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count); |
183 | }*/ | 185 | }*/ |
184 | } | 186 | /* } |
185 | } | 187 | } |
186 | } | 188 | } |
187 | 189 | ||
@@ -201,3 +203,4 @@ namespace OpenSim.Framework.Communications.Cache | |||
201 | } | 203 | } |
202 | } | 204 | } |
203 | } | 205 | } |
206 | */ \ 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 | |||
73 | get { return m_userProfileCacheService; } | 73 | get { return m_userProfileCacheService; } |
74 | } | 74 | } |
75 | 75 | ||
76 | protected AgentAssetTransactionsManager m_transactionsManager; | 76 | // protected AgentAssetTransactionsManager m_transactionsManager; |
77 | 77 | ||
78 | public AgentAssetTransactionsManager TransactionsManager | 78 | // public AgentAssetTransactionsManager TransactionsManager |
79 | { | 79 | // { |
80 | get { return m_transactionsManager; } | 80 | // get { return m_transactionsManager; } |
81 | } | 81 | // } |
82 | 82 | ||
83 | protected AssetCache m_assetCache; | 83 | protected AssetCache m_assetCache; |
84 | 84 | ||
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications | |||
100 | m_networkServersInfo = serversInfo; | 100 | m_networkServersInfo = serversInfo; |
101 | m_assetCache = assetCache; | 101 | m_assetCache = assetCache; |
102 | m_userProfileCacheService = new UserProfileCacheService(this); | 102 | m_userProfileCacheService = new UserProfileCacheService(this); |
103 | m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile); | 103 | // m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile); |
104 | } | 104 | } |
105 | 105 | ||
106 | public void doCreate(string[] cmmdParams) | 106 | public void doCreate(string[] cmmdParams) |