diff options
author | MW | 2007-08-26 17:57:25 +0000 |
---|---|---|
committer | MW | 2007-08-26 17:57:25 +0000 |
commit | 291eb48fb0338d80e3baeed65664d7a72fea1892 (patch) | |
tree | 8fa18a9474cb998a2e20fa9a124979b01bd41a8f /OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | |
parent | Danxors patch for >30prims with ODE (diff) | |
download | opensim-SC-291eb48fb0338d80e3baeed65664d7a72fea1892.zip opensim-SC-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.gz opensim-SC-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.bz2 opensim-SC-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.xz |
Another attempt to fix the image sending bug (next week, I intend to rewrite the assetcache and asset server).
Attempt to fix bug # 326. (crashing when using save-xml and hollow prims)
Attempt to fix bug # 328 (limit of 50 items in a folder)
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs index 1f5f99d..2e72a3e 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | |||
@@ -80,15 +80,16 @@ namespace OpenSim.Framework.Communications.Caches | |||
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
83 | public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data) | 83 | public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal) |
84 | { | 84 | { |
85 | // Console.WriteLine("asset upload of " + assetID); | ||
85 | AgentAssetTransactions transactions = this.GetUserTransActions(remoteClient.AgentId); | 86 | AgentAssetTransactions transactions = this.GetUserTransActions(remoteClient.AgentId); |
86 | if (transactions != null) | 87 | if (transactions != null) |
87 | { | 88 | { |
88 | AgentAssetTransactions.AssetXferUploader uploader = transactions.RequestXferUploader(transaction); | 89 | AgentAssetTransactions.AssetXferUploader uploader = transactions.RequestXferUploader(transaction); |
89 | if (uploader != null) | 90 | if (uploader != null) |
90 | { | 91 | { |
91 | uploader.Initialise(remoteClient, assetID, transaction, type, data); | 92 | uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal); |
92 | } | 93 | } |
93 | } | 94 | } |
94 | } | 95 | } |