diff options
| author | Tom Grimshaw | 2010-07-03 06:09:20 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-03 06:09:20 -0700 |
| commit | 2b49cb922799aadcdb93225d74735fcf7da94bbd (patch) | |
| tree | 11c7cd39ff5eb6d24e37e144b59552ea5b01875d /OpenSim | |
| parent | Implement a timeout value in the SynchronousRestObjectRequester. Default is 1... (diff) | |
| download | opensim-SC_OLD-2b49cb922799aadcdb93225d74735fcf7da94bbd.zip opensim-SC_OLD-2b49cb922799aadcdb93225d74735fcf7da94bbd.tar.gz opensim-SC_OLD-2b49cb922799aadcdb93225d74735fcf7da94bbd.tar.bz2 opensim-SC_OLD-2b49cb922799aadcdb93225d74735fcf7da94bbd.tar.xz | |
Make sure the AssetServiceConnector times out within 30 seconds. If it doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index e63dd50..1f40312 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -269,8 +269,8 @@ namespace OpenSim.Services.Connectors | |||
| 269 | try | 269 | try |
| 270 | { | 270 | { |
| 271 | newID = SynchronousRestObjectRequester. | 271 | newID = SynchronousRestObjectRequester. |
| 272 | MakeRequest<AssetBase, string>("POST", uri, asset); | 272 | MakeRequest<AssetBase, string>("POST", uri, asset, 25); |
| 273 | if (newID == null) | 273 | if (newID == null || newID == "") |
| 274 | { | 274 | { |
| 275 | newID = UUID.Zero.ToString(); | 275 | newID = UUID.Zero.ToString(); |
| 276 | } | 276 | } |