diff options
author | Justin Clark-Casey (justincc) | 2013-07-11 23:05:10 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-11 23:05:10 +0100 |
commit | f57f49eedeee28f9ee47a29ffbfb328fcae3cfa5 (patch) | |
tree | 8f8d71b5740e06526f1eb43e9b44461d7b12b807 /OpenSim/Services/Connectors/Asset | |
parent | Fix regression where llHTTPRequests which did not get an OK response returned... (diff) | |
parent | Added property to make for more flexible testing. (diff) | |
download | opensim-SC_OLD-f57f49eedeee28f9ee47a29ffbfb328fcae3cfa5.zip opensim-SC_OLD-f57f49eedeee28f9ee47a29ffbfb328fcae3cfa5.tar.gz opensim-SC_OLD-f57f49eedeee28f9ee47a29ffbfb328fcae3cfa5.tar.bz2 opensim-SC_OLD-f57f49eedeee28f9ee47a29ffbfb328fcae3cfa5.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/Asset')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index 7f7f251..8b04d7f 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -55,6 +55,11 @@ namespace OpenSim.Services.Connectors | |||
55 | // Maps: Asset ID -> Handlers which will be called when the asset has been loaded | 55 | // Maps: Asset ID -> Handlers which will be called when the asset has been loaded |
56 | private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>(); | 56 | private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>(); |
57 | 57 | ||
58 | public int MaxAssetRequestConcurrency | ||
59 | { | ||
60 | get { return m_maxAssetRequestConcurrency; } | ||
61 | set { m_maxAssetRequestConcurrency = value; } | ||
62 | } | ||
58 | 63 | ||
59 | public AssetServicesConnector() | 64 | public AssetServicesConnector() |
60 | { | 65 | { |