diff options
more work on texture downloading.
Refractored the TextureDownloadModule (but currently to make debugging easier, it is running as a non shared module, so this results in a instance of this module being created for each region (and a extra thread per region), this will be changed back soon.
Removed the old texture handling/sending code from AssetCache.
A few other small changes/fixes.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs index 580c56a..7de84fa 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
83 | } | 83 | } |
84 | 84 | ||
85 | public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, | 85 | public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, |
86 | byte[] data, bool storeLocal) | 86 | byte[] data, bool storeLocal, bool tempFile) |
87 | { | 87 | { |
88 | // Console.WriteLine("asset upload of " + assetID); | 88 | // Console.WriteLine("asset upload of " + assetID); |
89 | AgentAssetTransactions transactions = GetUserTransActions(remoteClient.AgentId); | 89 | AgentAssetTransactions transactions = GetUserTransActions(remoteClient.AgentId); |
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
92 | AgentAssetTransactions.AssetXferUploader uploader = transactions.RequestXferUploader(transaction); | 92 | AgentAssetTransactions.AssetXferUploader uploader = transactions.RequestXferUploader(transaction); |
93 | if (uploader != null) | 93 | if (uploader != null) |
94 | { | 94 | { |
95 | uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal); | 95 | uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile); |
96 | } | 96 | } |
97 | } | 97 | } |
98 | } | 98 | } |