From 91a604d4b6822130871f35ddbc2c53f3468c2a01 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 30 Apr 2011 17:40:21 -0700
Subject: Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest,
 because it was _way_ too low and is probably making writes abort in the
 middle.

---
 OpenSim/Framework/ChildAgentDataUpdate.cs |  1 -
 OpenSim/Framework/WebUtil.cs              | 15 +++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'OpenSim')

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
                 {
                     OSDMap info = new OSDMap(4);
                     info["sog"] = OSD.FromString(so.ToXml2());
-                    m_log.DebugFormat("[XXX] {0}", so.ToXml2());
                     info["extra"] = OSD.FromString(so.ExtraToXmlString());
                     info["modified"] = OSD.FromBoolean(so.HasGroupChanged);
                     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
                 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 = string.Empty;
-                    try
-                    {
-                        strBuffer = OSDParser.SerializeJsonString(data);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.DebugFormat("[WEB UTIL]: Exception serializing data {0}", e.Message);
-                        throw e;
-                    }
+                    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())
-- 
cgit v1.1