6 files changed, 2 insertions, 29 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ca67d84..79f4952 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -605,8 +605,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
 
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-//            resp.ReuseContext = true;
-//            resp.ReuseContext = false;
+
             HandleRequest(req, resp);
 
             // !!!HACK ALERT!!!
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index 8e1b545..a107ced 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -256,26 +256,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 _httpResponse.Reason = value;
             }
         }
-/*
-        public bool ReuseContext
-        {
-            get
-            {
-                if (_httpClientContext != null)
-                {
-                    return !_httpClientContext.EndWhenDone;
-                }
-                return true;
-            }
-            set
-            {
-                if (_httpClientContext != null)
-                {
-                    _httpClientContext.EndWhenDone = !value;
-                }
-            }
-        }
-*/
+
         protected IHttpResponse _httpResponse;
         private IHttpClientContext _httpClientContext;
 
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 7f24ebd..1e2e2e3 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -119,7 +119,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.SendChunked = false;
             response.ContentLength64 = 0;
             response.ContentEncoding = Encoding.UTF8;
-//            response.ReuseContext = false;
             response.KeepAlive = false;
             response.SendChunked = false;
             response.StatusCode = 503;
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 5f72733..31c317c 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -520,7 +520,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 response["str_response_string"] = "Script timeout";
                 response["content_type"] = "text/plain";
                 response["keepalive"] = false;
-                response["reusecontext"] = false;
 
                 //remove from map
                 lock (url.requests)
@@ -619,7 +618,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 response["str_response_string"] = "Script timeout";
                 response["content_type"] = "text/plain";
                 response["keepalive"] = false;
-                response["reusecontext"] = false;
                 return response;
             }
             //put response
@@ -627,7 +625,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             response["str_response_string"] = requestData.responseBody;
             response["content_type"] = requestData.responseType;
             response["keepalive"] = false;
-            response["reusecontext"] = false;
 
             if (url.allowXss)
                 response["access_control_allow_origin"] = "*";
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 89211a5..1345956 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -549,7 +549,6 @@ namespace SecondLife
             parameters.TreatWarningsAsErrors = false;
             parameters.GenerateInMemory = false;
 
-//          this seems to cause issues on some windows servers
 //            parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath,
 //                        m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation);
 
diff --git a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
index 2e17f1e..4577ca3 100644
--- a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
+++ b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
@@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common
         /// </summary>
         public string StatusDescription { get; set; }
 
-        public bool ReuseContext { get; set; }
-
         /// <summary>
         /// Add a header field and content to the response.
         /// </summary>