diff options
author | Melanie | 2013-01-27 00:20:34 +0100 |
---|---|---|
committer | Melanie | 2013-01-27 00:20:34 +0100 |
commit | 380b017e3295eaf30a4a96c23faed5be78495256 (patch) | |
tree | 215d0cf08ca8dfcf473b308e3c4871444cee94f7 /OpenSim/Region/CoreModules/Agent | |
parent | Reinstate cleaning objects from parcel when avatars sit on them. Instead do it (diff) | |
download | opensim-SC-380b017e3295eaf30a4a96c23faed5be78495256.zip opensim-SC-380b017e3295eaf30a4a96c23faed5be78495256.tar.gz opensim-SC-380b017e3295eaf30a4a96c23faed5be78495256.tar.bz2 opensim-SC-380b017e3295eaf30a4a96c23faed5be78495256.tar.xz |
Prevent items being destroyed by rename operations. Renaming of a wearable also
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 0aa4693..43b8b44 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -339,7 +339,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
339 | // to avoid a race condition when the appearance module retrieves the item to set the asset id in | 339 | // to avoid a race condition when the appearance module retrieves the item to set the asset id in |
340 | // the AvatarAppearance structure. | 340 | // the AvatarAppearance structure. |
341 | item.AssetID = m_asset.FullID; | 341 | item.AssetID = m_asset.FullID; |
342 | m_Scene.InventoryService.UpdateItem(item); | 342 | if (item.AssetID != UUID.Zero) |
343 | m_Scene.InventoryService.UpdateItem(item); | ||
343 | 344 | ||
344 | if (m_uploadState == UploadState.Complete) | 345 | if (m_uploadState == UploadState.Complete) |
345 | { | 346 | { |