cleanup

6 files changed, 9 insertions, 11 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()
             {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 5ceab0a..2ca1bce 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         #region Declares
 
         private Thread scriptLoadUnloadThread;
-        private static Thread staticScriptLoadUnloadThread;
+        private static Thread staticScriptLoadUnloadThread = null;
         private Queue<LUStruct> LUQueue = new Queue<LUStruct>();
         private static bool PrivateThread;
         private int LoadUnloadMaxQueueSize;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
index bb85508..202ce7a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
@@ -18528,7 +18528,6 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
    case 989: { ((LSLTokens)yym).str += '\\'; }
       break;
    case 994: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
-      break;
    case 999: { yym.yy_begin("COMMENT"); }
       break;
   }