diff options
author | Melanie | 2013-03-03 13:24:37 +0000 |
---|---|---|
committer | Melanie | 2013-03-03 13:24:37 +0000 |
commit | f39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch) | |
tree | a5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/CoreModules/Agent | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Make Keyframe motion cross regions again (diff) | |
download | opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2 opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 43b8b44..e13f479 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -260,10 +260,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
260 | { | 260 | { |
261 | CompleteTaskItemUpdate(m_updateTaskItemData); | 261 | CompleteTaskItemUpdate(m_updateTaskItemData); |
262 | } | 262 | } |
263 | // else if (m_storeLocal) | 263 | else if (m_asset.Local) |
264 | // { | 264 | { |
265 | // m_Scene.AssetService.Store(m_asset); | 265 | m_Scene.AssetService.Store(m_asset); |
266 | // } | 266 | } |
267 | } | 267 | } |
268 | 268 | ||
269 | m_log.DebugFormat( | 269 | m_log.DebugFormat( |
@@ -391,6 +391,11 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
391 | // m_asset.FullID, item.Name, ourClient.Name); | 391 | // m_asset.FullID, item.Name, ourClient.Name); |
392 | 392 | ||
393 | m_Scene.AssetService.Store(m_asset); | 393 | m_Scene.AssetService.Store(m_asset); |
394 | if (m_asset.FullID != UUID.Zero) | ||
395 | { | ||
396 | item.AssetID = m_asset.FullID; | ||
397 | m_Scene.InventoryService.UpdateItem(item); | ||
398 | } | ||
394 | 399 | ||
395 | m_transactions.RemoveXferUploader(m_transactionID); | 400 | m_transactions.RemoveXferUploader(m_transactionID); |
396 | } | 401 | } |