diff options
| author | Melanie | 2013-01-27 01:09:01 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-27 01:09:01 +0000 |
| commit | c3d68e7f9d91f202c0430faa78f59627ff796e3e (patch) | |
| tree | c8f306c455994112a11462d8c2286df45a975525 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent items being destroyed by rename operations. Renaming of a wearable also (diff) | |
| download | opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.zip opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.gz opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.bz2 opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 | { |