aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-09-09 23:17:18 +0100
committerUbitUmarov2015-09-09 23:17:18 +0100
commitb93412972eb992b31864dd03e4dda2b235f2244e (patch)
treed59d7785e5299fd48319147a0dbe34cbb63c8a8e /OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
parentminor clean, letting small classes be own module class (diff)
downloadopensim-SC_OLD-b93412972eb992b31864dd03e4dda2b235f2244e.zip
opensim-SC_OLD-b93412972eb992b31864dd03e4dda2b235f2244e.tar.gz
opensim-SC_OLD-b93412972eb992b31864dd03e4dda2b235f2244e.tar.bz2
opensim-SC_OLD-b93412972eb992b31864dd03e4dda2b235f2244e.tar.xz
revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 8f3cb80..8529f92 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Services.Connectors
322 bool success = false; 322 bool success = false;
323 try 323 try
324 { 324 {
325 AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30); 325 AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000);
326 if (a != null) 326 if (a != null)
327 { 327 {
328 if (m_Cache != null) 328 if (m_Cache != null)
@@ -481,7 +481,7 @@ namespace OpenSim.Services.Connectors
481 try 481 try
482 { 482 {
483 newID = SynchronousRestObjectRequester. 483 newID = SynchronousRestObjectRequester.
484 MakeRequest<AssetBase, string>("POST", uri, asset, 100); 484 MakeRequest<AssetBase, string>("POST", uri, asset, 100000);
485 if (newID == null || newID == "") 485 if (newID == null || newID == "")
486 { 486 {
487 newID = UUID.Zero.ToString(); 487 newID = UUID.Zero.ToString();