diff options
| author | Melanie | 2013-08-07 23:29:42 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-07 23:29:42 +0100 |
| commit | 005c69511dac490a8353233423a3152abf5580dd (patch) | |
| tree | abae7717af4af3ed7844f3747ab28398fdad9cdf /OpenSim/Tests | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff) | |
| download | opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.zip opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.gz opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.bz2 opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Clients/Assets/AssetsClient.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs index 26d740b..e988d0e 100644 --- a/OpenSim/Tests/Clients/Assets/AssetsClient.cs +++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs | |||
| @@ -68,8 +68,18 @@ namespace OpenSim.Tests.Clients.AssetsClient | |||
| 68 | m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} max threads = {1} - {2}", serverURI, max1, max2); | 68 | m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} max threads = {1} - {2}", serverURI, max1, max2); |
| 69 | ThreadPool.GetMinThreads(out max1, out max2); | 69 | ThreadPool.GetMinThreads(out max1, out max2); |
| 70 | m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} min threads = {1} - {2}", serverURI, max1, max2); | 70 | m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} min threads = {1} - {2}", serverURI, max1, max2); |
| 71 | ThreadPool.SetMinThreads(1, 1); | 71 | |
| 72 | ThreadPool.SetMaxThreads(10, 3); | 72 | if (!ThreadPool.SetMinThreads(1, 1)) |
| 73 | m_log.WarnFormat("[ASSET CLIENT]: Failed to set min threads"); | ||
| 74 | |||
| 75 | if (!ThreadPool.SetMaxThreads(10, 3)) | ||
| 76 | m_log.WarnFormat("[ASSET CLIENT]: Failed to set max threads"); | ||
| 77 | |||
| 78 | ThreadPool.GetMaxThreads(out max1, out max2); | ||
| 79 | m_log.InfoFormat("[ASSET CLIENT]: Post set max threads = {1} - {2}", serverURI, max1, max2); | ||
| 80 | ThreadPool.GetMinThreads(out max1, out max2); | ||
| 81 | m_log.InfoFormat("[ASSET CLIENT]: Post set min threads = {1} - {2}", serverURI, max1, max2); | ||
| 82 | |||
| 73 | ServicePointManager.DefaultConnectionLimit = 12; | 83 | ServicePointManager.DefaultConnectionLimit = 12; |
| 74 | 84 | ||
| 75 | AssetServicesConnector m_Connector = new AssetServicesConnector(serverURI); | 85 | AssetServicesConnector m_Connector = new AssetServicesConnector(serverURI); |