cleanup

4 files changed, 8 insertions, 9 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index dbbcc49..32c235a 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -865,7 +865,6 @@ namespace OpenSim.Framework.Communications.Cache
                 return true;
             }
         }
-
     }
 
     /// <summary>
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 28fb9df..3f3b1b8 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework.Servers
         public volatile bool HTTPDRunning = false;
 
         protected Thread m_workerThread;
-        protected HttpListener m_httpListener;
+        // protected HttpListener m_httpListener;
         protected CoolHTTPListener m_httpListener2;
         protected Dictionary<string, XmlRpcMethod> m_rpcHandlers        = new Dictionary<string, XmlRpcMethod>();
         protected Dictionary<string, bool> m_rpcHandlersKeepAlive       = new Dictionary<string, bool>();
@@ -371,7 +371,7 @@ namespace OpenSim.Framework.Servers
                     }
 
                     request.InputStream.Close();
-                    if (!response.IsContentTypeSet) response.ContentType = requestHandler.ContentType;
+                    response.ContentType = requestHandler.ContentType;
                     if (!response.SendChunked)
                         response.ContentLength64 = buffer.LongLength;
 
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index ff02edd..e46d605 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Framework.Servers
         /// <remarks>
         /// IsContentTypeSet will go away together with .NET base.
         /// </remarks>
-        public bool IsContentTypeSet
-        {
-            get { return _contentTypeSet; }
-        }
-        private bool _contentTypeSet;
+        // public bool IsContentTypeSet
+        // {
+        //     get { return _contentTypeSet; }
+        // }
+        // private bool _contentTypeSet;
 
 
         /// <summary>
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index 3a297bf..f3872a6 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Servers.Tests
             {
                 get { return _cookies; }
             }
-            private ResponseCookies _cookies;
+            private ResponseCookies _cookies = null;
 
             public TestHttpResponse()
             {