1 files changed, 8 insertions, 50 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index aee3e3c..1b9010a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -157,8 +157,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 foreach (PollServiceHttpRequest req in m_retryRequests)
                 {
-                   DoHTTPGruntWork(m_server,req,
-                        req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                   req.DoHTTPGruntWork(m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
                 }
             }
             catch
@@ -179,8 +178,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                 try
                 {
                     wreq = m_requests.Dequeue(0);
-                    DoHTTPGruntWork(m_server,wreq,
-                        wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
+                    wreq.DoHTTPGruntWork(
+                        m_server, wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
                 }
                 catch
                 {
@@ -214,7 +213,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             {
                                 try
                                 {
-                                    DoHTTPGruntWork(m_server, req, responsedata);
+                                    req.DoHTTPGruntWork(m_server, responsedata);
                                 }
                                 catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
                                 {
@@ -227,7 +226,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 {
                                     try
                                     {
-                                        DoHTTPGruntWork(m_server, req, responsedata);
+                                        req.DoHTTPGruntWork(m_server, responsedata);
                                     }
                                     catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
                                     {
@@ -242,8 +241,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                         {
                             if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
                             {
-                                DoHTTPGruntWork(m_server, req, 
-                                    req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                                req.DoHTTPGruntWork(
+                                    m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
                             }
                             else
                             {
@@ -258,46 +257,5 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
             }
         }
-
-        // DoHTTPGruntWork  changed, not sending response
-        // do the same work around as core
-
-        internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
-        {
-            OSHttpResponse response
-                = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
-
-            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
-
-            response.SendChunked = false;
-            response.ContentLength64 = buffer.Length;
-            response.ContentEncoding = Encoding.UTF8;
-
-            try
-            {
-                response.OutputStream.Write(buffer, 0, buffer.Length);
-            }
-            catch (Exception ex)
-            {
-                m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
-            }
-            finally
-            {
-                //response.OutputStream.Close();
-                try
-                {
-                    response.OutputStream.Flush();
-                    response.Send();
-
-                    //if (!response.KeepAlive && response.ReuseContext)
-                    //    response.FreeContext();
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
-                }
-            }
-        }
     }
-}
-
+}
\ No newline at end of file