From 363054bb2cb2df4cac63c901fd5db1bf082dbf6b Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 13 Jan 2009 18:23:37 +0000 Subject: [PATCH] * minor; Very minor non-functional tidy ups --- OpenSim/Framework/Servers/BaseHttpServer.cs | 17 ++++++----------- .../Environment/Scenes/SceneObjectPart.cs | 1 - 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index d7cf96e6ca..09adc11bfa 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -97,11 +97,9 @@ namespace OpenSim.Framework.Servers public BaseHttpServer(uint port, bool ssl) { m_ssl = ssl; - m_port = port; - + m_port = port; } - public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) { m_ssl = ssl; @@ -264,9 +262,7 @@ namespace OpenSim.Framework.Servers //request.QueryString = objstate.req.QueryString; */ - HandleRequest(request,resp); - - + HandleRequest(request,resp); } public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) @@ -280,7 +276,7 @@ namespace OpenSim.Framework.Servers // the request can be passed through to the other handlers. This is a low // probability event; if a request is matched it is normally expected to be // handled - //m_log.Info("[Debug BASE HTTP SERVER]: Handling Request" + request.RawUrl); + //m_log.Debug("[BASE HTTP SERVER]: Handling Request" + request.RawUrl); IHttpAgentHandler agentHandler; if (TryGetAgentHandler(request, response, out agentHandler)) @@ -302,7 +298,7 @@ namespace OpenSim.Framework.Servers if (TryGetStreamHandler(handlerKey, out requestHandler)) { - //m_log.Info("[Debug BASE HTTP SERVER]: Found Stream Handler"); + //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. byte[] buffer; if (requestHandler is IStreamedRequestHandler) @@ -313,7 +309,7 @@ namespace OpenSim.Framework.Servers } else if (requestHandler is IGenericHTTPHandler) { - //m_log.Info("[Debug BASE HTTP SERVER]: Found Caps based HTTP Handler"); + //m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler"); IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; Stream requestStream = request.InputStream; @@ -322,7 +318,6 @@ namespace OpenSim.Framework.Servers string requestBody = reader.ReadToEnd(); - reader.Close(); requestStream.Close(); @@ -1414,7 +1409,7 @@ namespace OpenSim.Framework.Servers } public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) - { + { switch (err) { case SocketError.NotSocket: diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index e86409060e..b22830cfff 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -688,7 +688,6 @@ namespace OpenSim.Region.Environment.Scenes set { m_acceleration = value; } } - public string Description { get { return m_description; }