aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-03-25 07:36:56 +0000
committerDr Scofield2009-03-25 07:36:56 +0000
commit0bb3d2e6d75baa244da1906e0466448cf4acb3be (patch)
tree324b6234d789311048899f0044756889cad39f23
parentHGStandaloneInventoryService now serves inventory assets. No need for clients... (diff)
downloadopensim-SC_OLD-0bb3d2e6d75baa244da1906e0466448cf4acb3be.zip
opensim-SC_OLD-0bb3d2e6d75baa244da1906e0466448cf4acb3be.tar.gz
opensim-SC_OLD-0bb3d2e6d75baa244da1906e0466448cf4acb3be.tar.bz2
opensim-SC_OLD-0bb3d2e6d75baa244da1906e0466448cf4acb3be.tar.xz
cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs4
-rw-r--r--OpenSim/Framework/Servers/OSHttpResponse.cs10
-rw-r--r--OpenSim/Framework/Servers/Tests/OSHttpTests.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs1
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
865 return true; 865 return true;
866 } 866 }
867 } 867 }
868
869 } 868 }
870 869
871 /// <summary> 870 /// <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
54 public volatile bool HTTPDRunning = false; 54 public volatile bool HTTPDRunning = false;
55 55
56 protected Thread m_workerThread; 56 protected Thread m_workerThread;
57 protected HttpListener m_httpListener; 57 // protected HttpListener m_httpListener;
58 protected CoolHTTPListener m_httpListener2; 58 protected CoolHTTPListener m_httpListener2;
59 protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>(); 59 protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
60 protected Dictionary<string, bool> m_rpcHandlersKeepAlive = new Dictionary<string, bool>(); 60 protected Dictionary<string, bool> m_rpcHandlersKeepAlive = new Dictionary<string, bool>();
@@ -371,7 +371,7 @@ namespace OpenSim.Framework.Servers
371 } 371 }
372 372
373 request.InputStream.Close(); 373 request.InputStream.Close();
374 if (!response.IsContentTypeSet) response.ContentType = requestHandler.ContentType; 374 response.ContentType = requestHandler.ContentType;
375 if (!response.SendChunked) 375 if (!response.SendChunked)
376 response.ContentLength64 = buffer.LongLength; 376 response.ContentLength64 = buffer.LongLength;
377 377
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
65 /// <remarks> 65 /// <remarks>
66 /// IsContentTypeSet will go away together with .NET base. 66 /// IsContentTypeSet will go away together with .NET base.
67 /// </remarks> 67 /// </remarks>
68 public bool IsContentTypeSet 68 // public bool IsContentTypeSet
69 { 69 // {
70 get { return _contentTypeSet; } 70 // get { return _contentTypeSet; }
71 } 71 // }
72 private bool _contentTypeSet; 72 // private bool _contentTypeSet;
73 73
74 74
75 /// <summary> 75 /// <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
281 { 281 {
282 get { return _cookies; } 282 get { return _cookies; }
283 } 283 }
284 private ResponseCookies _cookies; 284 private ResponseCookies _cookies = null;
285 285
286 public TestHttpResponse() 286 public TestHttpResponse()
287 { 287 {
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
69 #region Declares 69 #region Declares
70 70
71 private Thread scriptLoadUnloadThread; 71 private Thread scriptLoadUnloadThread;
72 private static Thread staticScriptLoadUnloadThread; 72 private static Thread staticScriptLoadUnloadThread = null;
73 private Queue<LUStruct> LUQueue = new Queue<LUStruct>(); 73 private Queue<LUStruct> LUQueue = new Queue<LUStruct>();
74 private static bool PrivateThread; 74 private static bool PrivateThread;
75 private int LoadUnloadMaxQueueSize; 75 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
18528 case 989: { ((LSLTokens)yym).str += '\\'; } 18528 case 989: { ((LSLTokens)yym).str += '\\'; }
18529 break; 18529 break;
18530 case 994: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } 18530 case 994: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
18531 break;
18532 case 999: { yym.yy_begin("COMMENT"); } 18531 case 999: { yym.yy_begin("COMMENT"); }
18533 break; 18532 break;
18534 } 18533 }