diff options
author | Justin Clark-Casey (justincc) | 2012-09-25 22:54:20 +0100 |
---|---|---|
committer | Melanie | 2012-09-27 15:27:25 +0100 |
commit | 5c8b9ff9ed479b9baf7d57c1b15f058d88778bc5 (patch) | |
tree | c8049f6c50d915249f24745f2c6b58e1d35b113c /OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |
parent | Move UDP update task item code to AssetXferUploader to match existing create ... (diff) | |
download | opensim-SC_OLD-5c8b9ff9ed479b9baf7d57c1b15f058d88778bc5.zip opensim-SC_OLD-5c8b9ff9ed479b9baf7d57c1b15f058d88778bc5.tar.gz opensim-SC_OLD-5c8b9ff9ed479b9baf7d57c1b15f058d88778bc5.tar.bz2 opensim-SC_OLD-5c8b9ff9ed479b9baf7d57c1b15f058d88778bc5.tar.xz |
Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
This was preventing the previous race condition fix in 4fc0cfb from actually working.
This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 59d0075..0271738 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
73 | { | 73 | { |
74 | if (!XferUploaders.ContainsKey(transactionID)) | 74 | if (!XferUploaders.ContainsKey(transactionID)) |
75 | { | 75 | { |
76 | uploader = new AssetXferUploader(this, m_Scene, m_dumpAssetsToFile); | 76 | uploader = new AssetXferUploader(this, m_Scene, transactionID, m_dumpAssetsToFile); |
77 | 77 | ||
78 | // m_log.DebugFormat( | 78 | // m_log.DebugFormat( |
79 | // "[AGENT ASSETS TRANSACTIONS]: Adding asset xfer uploader {0} since it didn't previously exist", transactionID); | 79 | // "[AGENT ASSETS TRANSACTIONS]: Adding asset xfer uploader {0} since it didn't previously exist", transactionID); |
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
151 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 151 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
152 | 152 | ||
153 | uploader.RequestCreateInventoryItem( | 153 | uploader.RequestCreateInventoryItem( |
154 | remoteClient, transactionID, folderID, callbackID, | 154 | remoteClient, folderID, callbackID, |
155 | description, name, invType, type, wearableType, nextOwnerMask); | 155 | description, name, invType, type, wearableType, nextOwnerMask); |
156 | } | 156 | } |
157 | 157 | ||
@@ -161,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
161 | { | 161 | { |
162 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 162 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
163 | 163 | ||
164 | uploader.RequestUpdateTaskInventoryItem(remoteClient, transactionID, item); | 164 | uploader.RequestUpdateTaskInventoryItem(remoteClient, item); |
165 | } | 165 | } |
166 | 166 | ||
167 | public void RequestUpdateInventoryItem(IClientAPI remoteClient, | 167 | public void RequestUpdateInventoryItem(IClientAPI remoteClient, |
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
169 | { | 169 | { |
170 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 170 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
171 | 171 | ||
172 | uploader.RequestUpdateInventoryItem(remoteClient, transactionID, item); | 172 | uploader.RequestUpdateInventoryItem(remoteClient, item); |
173 | } | 173 | } |
174 | } | 174 | } |
175 | } \ No newline at end of file | 175 | } \ No newline at end of file |