OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor; Very minor non-functional tidy ups

0.6.2-post-fixes
Justin Clarke Casey 2009-01-13 18:23:37 +00:00
parent 2676927466
commit 363054bb2c
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -97,11 +97,9 @@ namespace OpenSim.Framework.Servers
public BaseHttpServer(uint port, bool ssl) public BaseHttpServer(uint port, bool ssl)
{ {
m_ssl = ssl; m_ssl = ssl;
m_port = port; m_port = port;
} }
public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) public BaseHttpServer(uint port, bool ssl, uint sslport, string CN)
{ {
m_ssl = ssl; m_ssl = ssl;
@ -264,9 +262,7 @@ namespace OpenSim.Framework.Servers
//request.QueryString = objstate.req.QueryString; //request.QueryString = objstate.req.QueryString;
*/ */
HandleRequest(request,resp); HandleRequest(request,resp);
} }
public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) 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 // 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 // probability event; if a request is matched it is normally expected to be
// handled // handled
//m_log.Info("[Debug BASE HTTP SERVER]: Handling Request" + request.RawUrl); //m_log.Debug("[BASE HTTP SERVER]: Handling Request" + request.RawUrl);
IHttpAgentHandler agentHandler; IHttpAgentHandler agentHandler;
if (TryGetAgentHandler(request, response, out agentHandler)) if (TryGetAgentHandler(request, response, out agentHandler))
@ -302,7 +298,7 @@ namespace OpenSim.Framework.Servers
if (TryGetStreamHandler(handlerKey, out requestHandler)) 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. // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
byte[] buffer; byte[] buffer;
if (requestHandler is IStreamedRequestHandler) if (requestHandler is IStreamedRequestHandler)
@ -313,7 +309,7 @@ namespace OpenSim.Framework.Servers
} }
else if (requestHandler is IGenericHTTPHandler) 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; IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler;
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
@ -322,7 +318,6 @@ namespace OpenSim.Framework.Servers
string requestBody = reader.ReadToEnd(); string requestBody = reader.ReadToEnd();
reader.Close(); reader.Close();
requestStream.Close(); requestStream.Close();
@ -1414,7 +1409,7 @@ namespace OpenSim.Framework.Servers
} }
public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err)
{ {
switch (err) switch (err)
{ {
case SocketError.NotSocket: case SocketError.NotSocket:

1
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -688,7 +688,6 @@ namespace OpenSim.Region.Environment.Scenes
set { m_acceleration = value; } set { m_acceleration = value; }
} }
public string Description public string Description
{ {
get { return m_description; } get { return m_description; }