diff options
| author | Melanie | 2013-01-27 01:07:37 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-08 21:29:15 +0000 |
| commit | eab57cdd13b11523f4b83c7479a74309142bb56e (patch) | |
| tree | e6ddd663e7adb496bdb7f2331f88582cb3758c1e /OpenSim/Region/CoreModules/Agent | |
| parent | Fix issue where the "set terrain texture" console command did not tell the vi... (diff) | |
| download | opensim-SC_OLD-eab57cdd13b11523f4b83c7479a74309142bb56e.zip opensim-SC_OLD-eab57cdd13b11523f4b83c7479a74309142bb56e.tar.gz opensim-SC_OLD-eab57cdd13b11523f4b83c7479a74309142bb56e.tar.bz2 opensim-SC_OLD-eab57cdd13b11523f4b83c7479a74309142bb56e.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.
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
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 8add4bb..11efe6d 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
| @@ -321,7 +321,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 321 | // to avoid a race condition when the appearance module retrieves the item to set the asset id in | 321 | // to avoid a race condition when the appearance module retrieves the item to set the asset id in |
| 322 | // the AvatarAppearance structure. | 322 | // the AvatarAppearance structure. |
| 323 | item.AssetID = m_asset.FullID; | 323 | item.AssetID = m_asset.FullID; |
| 324 | m_Scene.InventoryService.UpdateItem(item); | 324 | if (item.AssetID != UUID.Zero) |
| 325 | m_Scene.InventoryService.UpdateItem(item); | ||
| 325 | 326 | ||
| 326 | if (m_uploadState == UploadState.Complete) | 327 | if (m_uploadState == UploadState.Complete) |
| 327 | { | 328 | { |