diff options
author | Melanie Thielker | 2009-02-19 03:09:56 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-02-19 03:09:56 +0000 |
commit | 863556f2cc545c56599aab9d28373aa4ed83288d (patch) | |
tree | 37ede97ac7497333690dfa23e9a1033bfaab59a6 /OpenSim/Region/CoreModules/Agent/AssetTransaction | |
parent | Mantis#3188. Thank you kindly, BlueWall, for a patch that: (diff) | |
download | opensim-SC_OLD-863556f2cc545c56599aab9d28373aa4ed83288d.zip opensim-SC_OLD-863556f2cc545c56599aab9d28373aa4ed83288d.tar.gz opensim-SC_OLD-863556f2cc545c56599aab9d28373aa4ed83288d.tar.bz2 opensim-SC_OLD-863556f2cc545c56599aab9d28373aa4ed83288d.tar.xz |
Thank you, Snowdrop, for a patch that makes the callback ID parameter
usable. Applied with formatting changes, please don't introduce
K&R style indentations into OpenSim
Fixes Mantis #3190
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index b71c2a6..7803209 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
148 | m_finished = true; | 148 | m_finished = true; |
149 | if (m_createItem) | 149 | if (m_createItem) |
150 | { | 150 | { |
151 | DoCreateItem(); | 151 | DoCreateItem(0); |
152 | } | 152 | } |
153 | else if (m_storeLocal) | 153 | else if (m_storeLocal) |
154 | { | 154 | { |
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
200 | 200 | ||
201 | if (m_finished) | 201 | if (m_finished) |
202 | { | 202 | { |
203 | DoCreateItem(); | 203 | DoCreateItem(callbackID); |
204 | } | 204 | } |
205 | else | 205 | else |
206 | { | 206 | { |
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
210 | } | 210 | } |
211 | 211 | ||
212 | 212 | ||
213 | private void DoCreateItem() | 213 | private void DoCreateItem(uint callbackID) |
214 | { | 214 | { |
215 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset); | 215 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset); |
216 | CachedUserInfo userInfo = | 216 | CachedUserInfo userInfo = |
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
238 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 238 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
239 | 239 | ||
240 | userInfo.AddItem(item); | 240 | userInfo.AddItem(item); |
241 | ourClient.SendInventoryItemCreateUpdate(item); | 241 | ourClient.SendInventoryItemCreateUpdate(item, callbackID); |
242 | } | 242 | } |
243 | else | 243 | else |
244 | { | 244 | { |