diff options
| author | Justin Clarke Casey | 2009-06-05 13:48:43 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-06-05 13:48:43 +0000 |
| commit | bfea07750835ab7b14f56e94bff869505a88ebb4 (patch) | |
| tree | da8dd21507a1e322d100ec05dd1803df9c6da0d3 /OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs | |
| parent | Thank you, thomax, for a patch to provide finer-grained access control to (diff) | |
| download | opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.zip opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.tar.gz opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.tar.bz2 opensim-SC_OLD-bfea07750835ab7b14f56e94bff869505a88ebb4.tar.xz | |
* Add oar saving timeout
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds
* Timeout executes abort, since missing assets in an OAR seems bad
* This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service
* This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
Diffstat (limited to 'OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs b/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs index 9eacf24..83a5676 100644 --- a/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs +++ b/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Framework.Servers | |||
| 61 | if (p.Length > 0) | 61 | if (p.Length > 0) |
| 62 | { | 62 | { |
| 63 | UUID assetID; | 63 | UUID assetID; |
| 64 | 64 | ||
| 65 | if (!UUID.TryParse(p[0], out assetID)) | 65 | if (!UUID.TryParse(p[0], out assetID)) |
| 66 | { | 66 | { |
| 67 | m_log.InfoFormat( | 67 | m_log.InfoFormat( |