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

cleanup

0.6.5-rc1
Dr Scofield 2009-03-25 07:36:56 +00:00
parent 2afe3be2e6
commit 0bb3d2e6d7
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -865,7 +865,6 @@ namespace OpenSim.Framework.Communications.Cache
return true; return true;
} }
} }
} }
/// <summary> /// <summary>

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

@ -54,7 +54,7 @@ namespace OpenSim.Framework.Servers
public volatile bool HTTPDRunning = false; public volatile bool HTTPDRunning = false;
protected Thread m_workerThread; protected Thread m_workerThread;
protected HttpListener m_httpListener; // protected HttpListener m_httpListener;
protected CoolHTTPListener m_httpListener2; protected CoolHTTPListener m_httpListener2;
protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>(); protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
protected Dictionary<string, bool> m_rpcHandlersKeepAlive = new Dictionary<string, bool>(); protected Dictionary<string, bool> m_rpcHandlersKeepAlive = new Dictionary<string, bool>();
@ -371,7 +371,7 @@ namespace OpenSim.Framework.Servers
} }
request.InputStream.Close(); request.InputStream.Close();
if (!response.IsContentTypeSet) response.ContentType = requestHandler.ContentType; response.ContentType = requestHandler.ContentType;
if (!response.SendChunked) if (!response.SendChunked)
response.ContentLength64 = buffer.LongLength; response.ContentLength64 = buffer.LongLength;

10
OpenSim/Framework/Servers/OSHttpResponse.cs
View File

@ -65,11 +65,11 @@ namespace OpenSim.Framework.Servers
/// <remarks> /// <remarks>
/// IsContentTypeSet will go away together with .NET base. /// IsContentTypeSet will go away together with .NET base.
/// </remarks> /// </remarks>
public bool IsContentTypeSet // public bool IsContentTypeSet
{ // {
get { return _contentTypeSet; } // get { return _contentTypeSet; }
} // }
private bool _contentTypeSet; // private bool _contentTypeSet;
/// <summary> /// <summary>

2
OpenSim/Framework/Servers/Tests/OSHttpTests.cs
View File

@ -281,7 +281,7 @@ namespace OpenSim.Framework.Servers.Tests
{ {
get { return _cookies; } get { return _cookies; }
} }
private ResponseCookies _cookies; private ResponseCookies _cookies = null;
public TestHttpResponse() public TestHttpResponse()
{ {

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
#region Declares #region Declares
private Thread scriptLoadUnloadThread; private Thread scriptLoadUnloadThread;
private static Thread staticScriptLoadUnloadThread; private static Thread staticScriptLoadUnloadThread = null;
private Queue<LUStruct> LUQueue = new Queue<LUStruct>(); private Queue<LUStruct> LUQueue = new Queue<LUStruct>();
private static bool PrivateThread; private static bool PrivateThread;
private int LoadUnloadMaxQueueSize; private int LoadUnloadMaxQueueSize;

1
OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
View File

@ -18528,7 +18528,6 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
case 989: { ((LSLTokens)yym).str += '\\'; } case 989: { ((LSLTokens)yym).str += '\\'; }
break; break;
case 994: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } 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"); } case 999: { yym.yy_begin("COMMENT"); }
break; break;
} }