diff options
| author | UbitUmarov | 2017-06-10 02:48:51 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-06-10 02:48:51 +0100 |
| commit | b5910cfdb7461d523e2dc34dc9f33fe096766525 (patch) | |
| tree | c8fa1bfd77c9b77f636117b953422f2cf66c0c07 /OpenSim/Region/CoreModules/Asset | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | add a adicional in transit flag to signal HG tps, and use it to ignore userna... (diff) | |
| download | opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.zip opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.gz opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.bz2 opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.xz | |
merge
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index e5ac17d..f2fc070 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -1168,7 +1168,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 1168 | 1168 | ||
| 1169 | con.Output("FloatSam Ensuring assets are cached for all scenes."); | 1169 | con.Output("FloatSam Ensuring assets are cached for all scenes."); |
| 1170 | 1170 | ||
| 1171 | WorkManager.RunInThread(delegate | 1171 | WorkManager.RunInThreadPool(delegate |
| 1172 | { | 1172 | { |
| 1173 | bool wasRunning= false; | 1173 | bool wasRunning= false; |
| 1174 | lock(timerLock) | 1174 | lock(timerLock) |