diff options
| author | Justin Clark-Casey (justincc) | 2014-11-06 01:15:22 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:11 +0000 |
| commit | aeae34505f5f306bbf4d9f3db19db8a26ac5e63d (patch) | |
| tree | 1a6afdaeb024dc9ffa60cf98e9f53afc1f992c96 /OpenSim/Services | |
| parent | Introduce an IteratingUuidGatherer where each fetch from the asset service (i... (diff) | |
| download | opensim-SC_OLD-aeae34505f5f306bbf4d9f3db19db8a26ac5e63d.zip opensim-SC_OLD-aeae34505f5f306bbf4d9f3db19db8a26ac5e63d.tar.gz opensim-SC_OLD-aeae34505f5f306bbf4d9f3db19db8a26ac5e63d.tar.bz2 opensim-SC_OLD-aeae34505f5f306bbf4d9f3db19db8a26ac5e63d.tar.xz | |
When processing incoming attachments via HG, if a request for uuid gathering or final asset import takes too long remove remaining requests from same user to prevent hold up of other user's incoming attachments.
This improves upon the earlier naive simply queueing immplementation.
Threshold is 30 seconds. If this happens to a user they can relog and fetch will be reattempted.
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGAssetService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index 5c804d4..b57f8d8 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
| @@ -100,7 +100,7 @@ namespace OpenSim.Services.HypergridService | |||
| 100 | return null; | 100 | return null; |
| 101 | 101 | ||
| 102 | if (asset.Metadata.Type == (sbyte)AssetType.Object) | 102 | if (asset.Metadata.Type == (sbyte)AssetType.Object) |
| 103 | asset.Data = AdjustIdentifiers(asset.Data); ; | 103 | asset.Data = AdjustIdentifiers(asset.Data); |
| 104 | 104 | ||
| 105 | AdjustIdentifiers(asset.Metadata); | 105 | AdjustIdentifiers(asset.Metadata); |
| 106 | 106 | ||