ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into caps

Browse Source
This commit is contained in:
Diva Canto
2011-05-01 09:11:16 -07:00
parent 6b2b036387 d4323dd753
commit f0bf64b6de
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/ChildAgentDataUpdate.cs
View File

@@ -462,7 +462,7 @@ namespace OpenSim.Framework
}
catch (IndexOutOfRangeException e)
{
m_log.WarnFormat("[CHILD AGENT DATA]: scrtips list is shorter than object list.");
m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list.");
}
attObjs.Add(info);

12
OpenSim/Framework/WebUtil.cs
View File

@@ -142,17 +142,17 @@ namespace OpenSim.Framework
/// </summary>
public static OSDMap PutToService(string url, OSDMap data)
{
return ServiceOSDRequest(url,data,"PUT",10000);
return ServiceOSDRequest(url,data,"PUT",30000);
}
public static OSDMap PostToService(string url, OSDMap data)
{
return ServiceOSDRequest(url,data,"POST",10000);
return ServiceOSDRequest(url,data,"POST",30000);
}
public static OSDMap GetFromService(string url)
{
return ServiceOSDRequest(url,null,"GET",10000);
return ServiceOSDRequest(url,null,"GET",30000);
}
public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -171,15 +171,15 @@ namespace OpenSim.Framework
request.Timeout = timeout;
request.KeepAlive = false;
request.MaximumAutomaticRedirections = 10;
request.ReadWriteTimeout = timeout / 4;
request.ReadWriteTimeout = timeout * 8;
request.Headers[OSHeaderRequestID] = reqnum.ToString();
// If there is some input, write it into the request
if (data != null)
{
string strBuffer = OSDParser.SerializeJsonString(data);
string strBuffer = OSDParser.SerializeJsonString(data);
byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
request.ContentType = "application/json";
request.ContentLength = buffer.Length; //Count bytes to send
using (Stream requestStream = request.GetRequestStream())