diff options
author | John Hurliman | 2009-10-09 02:10:53 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-09 02:10:53 -0700 |
commit | 494a1e922dd5c86ef54d7a83347ec8ba255e0e83 (patch) | |
tree | eb5a6eb7282007d970f672fe044ab60aea895f07 /OpenSim/Region | |
parent | * Added a lock object for the write functions in LLUDPClientCollection (immut... (diff) | |
download | opensim-SC_OLD-494a1e922dd5c86ef54d7a83347ec8ba255e0e83.zip opensim-SC_OLD-494a1e922dd5c86ef54d7a83347ec8ba255e0e83.tar.gz opensim-SC_OLD-494a1e922dd5c86ef54d7a83347ec8ba255e0e83.tar.bz2 opensim-SC_OLD-494a1e922dd5c86ef54d7a83347ec8ba255e0e83.tar.xz |
Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBackground.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs index ac5e241..008c6b0 100644 --- a/OpenSim/Region/Application/OpenSimBackground.cs +++ b/OpenSim/Region/Application/OpenSimBackground.cs | |||
@@ -58,6 +58,7 @@ namespace OpenSim | |||
58 | m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); | 58 | m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); |
59 | 59 | ||
60 | WorldHasComeToAnEnd.WaitOne(); | 60 | WorldHasComeToAnEnd.WaitOne(); |
61 | WorldHasComeToAnEnd.Close(); | ||
61 | } | 62 | } |
62 | 63 | ||
63 | /// <summary> | 64 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index b885420..9b565ed 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
57 | public string body; | 57 | public string body; |
58 | public int responseCode; | 58 | public int responseCode; |
59 | public string responseBody; | 59 | public string responseBody; |
60 | public ManualResetEvent ev; | 60 | //public ManualResetEvent ev; |
61 | public bool requestDone; | 61 | public bool requestDone; |
62 | public int startTime; | 62 | public int startTime; |
63 | public string uri; | 63 | public string uri; |
@@ -456,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
456 | requestData.headers["x-query-string"] = queryString; | 456 | requestData.headers["x-query-string"] = queryString; |
457 | requestData.headers["x-script-url"] = url.url; | 457 | requestData.headers["x-script-url"] = url.url; |
458 | 458 | ||
459 | requestData.ev = new ManualResetEvent(false); | 459 | //requestData.ev = new ManualResetEvent(false); |
460 | lock (url.requests) | 460 | lock (url.requests) |
461 | { | 461 | { |
462 | url.requests.Add(requestID, requestData); | 462 | url.requests.Add(requestID, requestData); |