diff options
| author | Melanie | 2012-09-16 04:21:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:21:18 +0100 |
| commit | 66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba (patch) | |
| tree | f5ce10e917fa3ab24ed98cc10ca5a87057da71a9 /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revamp the HTTP textures handler to allow a maximum of four fetches (diff) | |
| download | opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.zip opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.gz opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.bz2 opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index 9e04601..daf38bc 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
| @@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors | |||
| 193 | if (asset == null || asset.Data == null || asset.Data.Length == 0) | 193 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
| 194 | { | 194 | { |
| 195 | asset = SynchronousRestObjectRequester. | 195 | asset = SynchronousRestObjectRequester. |
| 196 | MakeRequest<int, AssetBase>("GET", uri, 0); | 196 | MakeRequest<int, AssetBase>("GET", uri, 0, 30); |
| 197 | 197 | ||
| 198 | if (m_Cache != null) | 198 | if (m_Cache != null) |
| 199 | m_Cache.Cache(asset); | 199 | m_Cache.Cache(asset); |
| @@ -321,7 +321,7 @@ namespace OpenSim.Services.Connectors | |||
| 321 | h.Invoke(a); | 321 | h.Invoke(a); |
| 322 | if (handlers != null) | 322 | if (handlers != null) |
| 323 | handlers.Clear(); | 323 | handlers.Clear(); |
| 324 | }); | 324 | }, 30); |
| 325 | 325 | ||
| 326 | success = true; | 326 | success = true; |
| 327 | } | 327 | } |