diff options
author | John Hurliman | 2009-10-19 16:52:27 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-19 16:52:27 -0700 |
commit | fdce1be3db287bed901332b90ba57165e201d3fc (patch) | |
tree | 8f0792e4c4ac4c14a50559f8439573740a7b3326 /OpenSim/Framework | |
parent | Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into... (diff) | |
download | opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.zip opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.tar.gz opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.tar.bz2 opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.tar.xz |
* Removed OpenSim.Data.NHibernate
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/RestClient.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Parallel.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs index a74169e..317b3a0 100644 --- a/OpenSim/Framework/Communications/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient.cs | |||
@@ -403,7 +403,7 @@ namespace OpenSim.Framework.Communications | |||
403 | /// In case, we are invoked asynchroneously this object will keep track of the state | 403 | /// In case, we are invoked asynchroneously this object will keep track of the state |
404 | /// </summary> | 404 | /// </summary> |
405 | AsyncResult<Stream> ar = new AsyncResult<Stream>(callback, state); | 405 | AsyncResult<Stream> ar = new AsyncResult<Stream>(callback, state); |
406 | ThreadPool.QueueUserWorkItem(RequestHelper, ar); | 406 | ThreadPool.UnsafeQueueUserWorkItem(RequestHelper, ar); |
407 | return ar; | 407 | return ar; |
408 | } | 408 | } |
409 | 409 | ||
diff --git a/OpenSim/Framework/Parallel.cs b/OpenSim/Framework/Parallel.cs index cf4f773..ab2e108 100644 --- a/OpenSim/Framework/Parallel.cs +++ b/OpenSim/Framework/Parallel.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Framework | |||
66 | 66 | ||
67 | for (int i = 0; i < threadCount; i++) | 67 | for (int i = 0; i < threadCount; i++) |
68 | { | 68 | { |
69 | ThreadPool.QueueUserWorkItem( | 69 | ThreadPool.UnsafeQueueUserWorkItem( |
70 | delegate(object o) | 70 | delegate(object o) |
71 | { | 71 | { |
72 | int threadIndex = (int)o; | 72 | int threadIndex = (int)o; |
@@ -122,7 +122,7 @@ namespace OpenSim.Framework | |||
122 | 122 | ||
123 | for (int i = 0; i < threadCount; i++) | 123 | for (int i = 0; i < threadCount; i++) |
124 | { | 124 | { |
125 | ThreadPool.QueueUserWorkItem( | 125 | ThreadPool.UnsafeQueueUserWorkItem( |
126 | delegate(object o) | 126 | delegate(object o) |
127 | { | 127 | { |
128 | int threadIndex = (int)o; | 128 | int threadIndex = (int)o; |
@@ -178,7 +178,7 @@ namespace OpenSim.Framework | |||
178 | 178 | ||
179 | for (int i = 0; i < threadCount; i++) | 179 | for (int i = 0; i < threadCount; i++) |
180 | { | 180 | { |
181 | ThreadPool.QueueUserWorkItem( | 181 | ThreadPool.UnsafeQueueUserWorkItem( |
182 | delegate(object o) | 182 | delegate(object o) |
183 | { | 183 | { |
184 | int threadIndex = (int)o; | 184 | int threadIndex = (int)o; |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 942fed9..85d7be2 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1609,7 +1609,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1609 | //while (true) | 1609 | //while (true) |
1610 | //{ | 1610 | //{ |
1611 | // context = m_httpListener.GetContext(); | 1611 | // context = m_httpListener.GetContext(); |
1612 | // ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); | 1612 | // ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(HandleRequest), context); |
1613 | // } | 1613 | // } |
1614 | } | 1614 | } |
1615 | catch (Exception e) | 1615 | catch (Exception e) |