aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTom Grimshaw2010-07-04 19:25:54 -0700
committerTom Grimshaw2010-07-04 19:25:54 -0700
commit7665013ad8c7ac876955dc803619405dfa2af71d (patch)
tree92c0f75d6078d221b3a3efe01e5bee6069bc0b41 /OpenSim
parentAdd System.Core assembly reference to two projects so that TimeZoneInfo can b... (diff)
downloadopensim-SC-7665013ad8c7ac876955dc803619405dfa2af71d.zip
opensim-SC-7665013ad8c7ac876955dc803619405dfa2af71d.tar.gz
opensim-SC-7665013ad8c7ac876955dc803619405dfa2af71d.tar.bz2
opensim-SC-7665013ad8c7ac876955dc803619405dfa2af71d.tar.xz
Correct positioning of timeout modifier in the SynchronousRestObjectRequester
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index bb3b8b1..f07f7ab 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Framework.Servers.HttpServer
77 77
78 WebRequest request = WebRequest.Create(requestUrl); 78 WebRequest request = WebRequest.Create(requestUrl);
79 request.Method = verb; 79 request.Method = verb;
80 request.Timeout = pTimeout * 1000;
80 81
81 if ((verb == "POST") || (verb == "PUT")) 82 if ((verb == "POST") || (verb == "PUT"))
82 { 83 {
@@ -96,7 +97,6 @@ namespace OpenSim.Framework.Servers.HttpServer
96 97
97 int length = (int) buffer.Length; 98 int length = (int) buffer.Length;
98 request.ContentLength = length; 99 request.ContentLength = length;
99 request.Timeout = pTimeout * 1000;
100 Stream requestStream = null; 100 Stream requestStream = null;
101 try 101 try
102 { 102 {