1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 7c268ed..088d944 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -496,7 +496,7 @@ namespace OpenSim.Framework.Servers
            }
        }
-        private void DoHTTPGruntWork(Hashtable responsedata, HttpListenerResponse response)
+        private static void DoHTTPGruntWork(Hashtable responsedata, HttpListenerResponse response)
        {
            int responsecode = (int)responsedata["int_response_code"];
            string responseString = (string)responsedata["str_response_string"];
@@ -505,7 +505,7 @@ namespace OpenSim.Framework.Servers
            //Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this
            //and should check for NullReferenceExceptions
-            if (contentType == null || contentType == "")
+            if (string.IsNullOrEmpty(contentType))
            {
                contentType = "text/html";
            }
@@ -677,12 +677,12 @@ namespace OpenSim.Framework.Servers
        }
        // Fallback HTTP responses in case the HTTP error response files don't exist
-        private string getDefaultHTTP404(string host)
+        private static string getDefaultHTTP404(string host)
        {
            return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested has been obsconded with by knomes. Find hippos quick!</P><P>If you are trying to log-in, your link parameters should have: &quot;-loginpage http://" + host + "/?method=login -loginuri http://" + host + "/&quot; in your link </P></BODY></HTML>";
        }
-        private string getDefaultHTTP500()
+        private static string getDefaultHTTP500()
        {
            return "<HTML><HEAD><TITLE>500 Internal Server Error</TITLE><BODY><BR /><H1>Ooops!</H1><P>The server you requested is overun by knomes! Find hippos quick!</P></BODY></HTML>";
        }

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 7c268ed..088d944 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -496,7 +496,7 @@ namespace OpenSim.Framework.Servers
496	}	496	}
497	}	497	}
498		498
499	private void DoHTTPGruntWork(Hashtable responsedata, HttpListenerResponse response)	499	private static void DoHTTPGruntWork(Hashtable responsedata, HttpListenerResponse response)
500	{	500	{
501	int responsecode = (int)responsedata["int_response_code"];	501	int responsecode = (int)responsedata["int_response_code"];
502	string responseString = (string)responsedata["str_response_string"];	502	string responseString = (string)responsedata["str_response_string"];
@@ -505,7 +505,7 @@ namespace OpenSim.Framework.Servers
505	//Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this	505	//Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this
506	//and should check for NullReferenceExceptions	506	//and should check for NullReferenceExceptions
507		507
508	if (contentType == null \|\| contentType == "")	508	if (string.IsNullOrEmpty(contentType))
509	{	509	{
510	contentType = "text/html";	510	contentType = "text/html";
511	}	511	}
@@ -677,12 +677,12 @@ namespace OpenSim.Framework.Servers
677	}	677	}
678		678
679	// Fallback HTTP responses in case the HTTP error response files don't exist	679	// Fallback HTTP responses in case the HTTP error response files don't exist
680	private string getDefaultHTTP404(string host)	680	private static string getDefaultHTTP404(string host)
681	{	681	{
682	return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested has been obsconded with by knomes. Find hippos quick!</P><P>If you are trying to log-in, your link parameters should have: "-loginpage http://" + host + "/?method=login -loginuri http://" + host + "/" in your link </P></BODY></HTML>";	682	return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested has been obsconded with by knomes. Find hippos quick!</P><P>If you are trying to log-in, your link parameters should have: "-loginpage http://" + host + "/?method=login -loginuri http://" + host + "/" in your link </P></BODY></HTML>";
683	}	683	}
684		684
685	private string getDefaultHTTP500()	685	private static string getDefaultHTTP500()
686	{	686	{
687	return "<HTML><HEAD><TITLE>500 Internal Server Error</TITLE><BODY><BR /><H1>Ooops!</H1><P>The server you requested is overun by knomes! Find hippos quick!</P></BODY></HTML>";	687	return "<HTML><HEAD><TITLE>500 Internal Server Error</TITLE><BODY><BR /><H1>Ooops!</H1><P>The server you requested is overun by knomes! Find hippos quick!</P></BODY></HTML>";
688	}	688	}