diff options
| author | Justin Clark-Casey (justincc) | 2013-01-29 03:59:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-29 03:59:38 +0000 |
| commit | 77cd74ded645e8f479a81ba6cb1456f6cace7a67 (patch) | |
| tree | 15c197fb8800aa2d2f69c9563ba72d646831a43f /OpenSim/Region/CoreModules/Agent | |
| parent | minor: remove some mono compile warnings in XEngine.cs (diff) | |
| parent | BulletSim: enable angular vertical attraction. (diff) | |
| download | opensim-SC_OLD-77cd74ded645e8f479a81ba6cb1456f6cace7a67.zip opensim-SC_OLD-77cd74ded645e8f479a81ba6cb1456f6cace7a67.tar.gz opensim-SC_OLD-77cd74ded645e8f479a81ba6cb1456f6cace7a67.tar.bz2 opensim-SC_OLD-77cd74ded645e8f479a81ba6cb1456f6cace7a67.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | { |