aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2011-05-03 14:26:18 +0100
committerMelanie2011-05-03 14:26:18 +0100
commitaf55eda16b1025796a61289a0ab84b26e6444627 (patch)
tree6449c15b8f54240cfef62d606fab88a185f75f03 /OpenSim/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentIncreased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
downloadopensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.zip
opensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.tar.gz
opensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.tar.bz2
opensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs2
-rw-r--r--OpenSim/Framework/WebUtil.cs21
2 files changed, 9 insertions, 14 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index a626b82..28fe3ba 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
462 } 462 }
463 catch (IndexOutOfRangeException e) 463 catch (IndexOutOfRangeException e)
464 { 464 {
465 m_log.WarnFormat("[CHILD AGENT DATA]: scrtips list is shorter than object list."); 465 m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list.");
466 } 466 }
467 467
468 attObjs.Add(info); 468 attObjs.Add(info);
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index d04a3df..e77b88b 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -140,24 +140,19 @@ namespace OpenSim.Framework
140 /// PUT JSON-encoded data to a web service that returns LLSD or 140 /// PUT JSON-encoded data to a web service that returns LLSD or
141 /// JSON data 141 /// JSON data
142 /// </summary> 142 /// </summary>
143 public static OSDMap PutToService(string url, OSDMap data) 143 public static OSDMap PutToService(string url, OSDMap data, int timeout)
144 { 144 {
145 return ServiceOSDRequest(url,data,"PUT", 20000); 145 return ServiceOSDRequest(url,data, "PUT", timeout);
146 }
147
148 public static OSDMap PostToService(string url, OSDMap data)
149 {
150 return PostToService(url, data, 20000);
151 } 146 }
152 147
153 public static OSDMap PostToService(string url, OSDMap data, int timeout) 148 public static OSDMap PostToService(string url, OSDMap data, int timeout)
154 { 149 {
155 return ServiceOSDRequest(url,data,"POST", timeout); 150 return ServiceOSDRequest(url, data, "POST", timeout);
156 } 151 }
157 152
158 public static OSDMap GetFromService(string url) 153 public static OSDMap GetFromService(string url, int timeout)
159 { 154 {
160 return ServiceOSDRequest(url,null,"GET", 20000); 155 return ServiceOSDRequest(url, null, "GET", timeout);
161 } 156 }
162 157
163 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) 158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -182,9 +177,9 @@ namespace OpenSim.Framework
182 // If there is some input, write it into the request 177 // If there is some input, write it into the request
183 if (data != null) 178 if (data != null)
184 { 179 {
185 string strBuffer = OSDParser.SerializeJsonString(data); 180 string strBuffer = OSDParser.SerializeJsonString(data);
186 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); 181 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
187 182
188 request.ContentType = "application/json"; 183 request.ContentType = "application/json";
189 request.ContentLength = buffer.Length; //Count bytes to send 184 request.ContentLength = buffer.Length; //Count bytes to send
190 using (Stream requestStream = request.GetRequestStream()) 185 using (Stream requestStream = request.GetRequestStream())