diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 15 |
2 files changed, 3 insertions, 13 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index c4b5dde..28fe3ba 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -454,7 +454,6 @@ namespace OpenSim.Framework | |||
454 | { | 454 | { |
455 | OSDMap info = new OSDMap(4); | 455 | OSDMap info = new OSDMap(4); |
456 | info["sog"] = OSD.FromString(so.ToXml2()); | 456 | info["sog"] = OSD.FromString(so.ToXml2()); |
457 | m_log.DebugFormat("[XXX] {0}", so.ToXml2()); | ||
458 | info["extra"] = OSD.FromString(so.ExtraToXmlString()); | 457 | info["extra"] = OSD.FromString(so.ExtraToXmlString()); |
459 | info["modified"] = OSD.FromBoolean(so.HasGroupChanged); | 458 | info["modified"] = OSD.FromBoolean(so.HasGroupChanged); |
460 | try | 459 | try |
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 5449a6f..f6fed33 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -171,24 +171,15 @@ namespace OpenSim.Framework | |||
171 | request.Timeout = timeout; | 171 | request.Timeout = timeout; |
172 | request.KeepAlive = false; | 172 | request.KeepAlive = false; |
173 | request.MaximumAutomaticRedirections = 10; | 173 | request.MaximumAutomaticRedirections = 10; |
174 | request.ReadWriteTimeout = timeout / 4; | 174 | request.ReadWriteTimeout = timeout * 8; |
175 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); | 175 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); |
176 | 176 | ||
177 | // If there is some input, write it into the request | 177 | // If there is some input, write it into the request |
178 | if (data != null) | 178 | if (data != null) |
179 | { | 179 | { |
180 | string strBuffer = string.Empty; | 180 | string strBuffer = OSDParser.SerializeJsonString(data); |
181 | try | ||
182 | { | ||
183 | strBuffer = OSDParser.SerializeJsonString(data); | ||
184 | } | ||
185 | catch (Exception e) | ||
186 | { | ||
187 | m_log.DebugFormat("[WEB UTIL]: Exception serializing data {0}", e.Message); | ||
188 | throw e; | ||
189 | } | ||
190 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); | 181 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); |
191 | 182 | ||
192 | request.ContentType = "application/json"; | 183 | request.ContentType = "application/json"; |
193 | request.ContentLength = buffer.Length; //Count bytes to send | 184 | request.ContentLength = buffer.Length; //Count bytes to send |
194 | using (Stream requestStream = request.GetRequestStream()) | 185 | using (Stream requestStream = request.GetRequestStream()) |