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/Region | |
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/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b027882..a966b42 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -791,7 +791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
791 | /// <param name="map">heightmap</param> | 791 | /// <param name="map">heightmap</param> |
792 | public virtual void SendLayerData(float[] map) | 792 | public virtual void SendLayerData(float[] map) |
793 | { | 793 | { |
794 | ThreadPool.QueueUserWorkItem(DoSendLayerData, map); | 794 | ThreadPool.UnsafeQueueUserWorkItem(DoSendLayerData, map); |
795 | } | 795 | } |
796 | 796 | ||
797 | /// <summary> | 797 | /// <summary> |
@@ -912,7 +912,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
912 | /// <param name="windSpeeds">16x16 array of wind speeds</param> | 912 | /// <param name="windSpeeds">16x16 array of wind speeds</param> |
913 | public virtual void SendWindData(Vector2[] windSpeeds) | 913 | public virtual void SendWindData(Vector2[] windSpeeds) |
914 | { | 914 | { |
915 | ThreadPool.QueueUserWorkItem(new WaitCallback(DoSendWindData), (object)windSpeeds); | 915 | ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(DoSendWindData), (object)windSpeeds); |
916 | } | 916 | } |
917 | 917 | ||
918 | /// <summary> | 918 | /// <summary> |
@@ -921,7 +921,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
921 | /// <param name="windSpeeds">16x16 array of cloud densities</param> | 921 | /// <param name="windSpeeds">16x16 array of cloud densities</param> |
922 | public virtual void SendCloudData(float[] cloudDensity) | 922 | public virtual void SendCloudData(float[] cloudDensity) |
923 | { | 923 | { |
924 | ThreadPool.QueueUserWorkItem(new WaitCallback(DoSendCloudData), (object)cloudDensity); | 924 | ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(DoSendCloudData), (object)cloudDensity); |
925 | } | 925 | } |
926 | 926 | ||
927 | /// <summary> | 927 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 5ca4178..d45c35c 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -313,11 +313,11 @@ namespace Flotsam.RegionModules.AssetCache | |||
313 | 313 | ||
314 | } | 314 | } |
315 | 315 | ||
316 | ThreadPool.QueueUserWorkItem( | 316 | ThreadPool.UnsafeQueueUserWorkItem( |
317 | delegate | 317 | delegate |
318 | { | 318 | { |
319 | WriteFileCache(filename, asset); | 319 | WriteFileCache(filename, asset); |
320 | } | 320 | }, null |
321 | ); | 321 | ); |
322 | } | 322 | } |
323 | } | 323 | } |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 4fb4c51..1260584 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1095,7 +1095,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1095 | // The reason is so we don't cause the thread to freeze waiting | 1095 | // The reason is so we don't cause the thread to freeze waiting |
1096 | // for the 1 second it costs to start a thread manually. | 1096 | // for the 1 second it costs to start a thread manually. |
1097 | if (!threadrunning) | 1097 | if (!threadrunning) |
1098 | ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread)); | 1098 | ThreadPool.UnsafeQueueUserWorkItem(this.StartThread, null); |
1099 | 1099 | ||
1100 | lock (m_rootAgents) | 1100 | lock (m_rootAgents) |
1101 | { | 1101 | { |