diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-24 15:20:47 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-24 15:20:47 -0500 |
commit | bd653fb69382e5a94417ff13c4041b2bc7efdc1f (patch) | |
tree | d5c02d1fef5e0a541cc30cd7e7f79dced9532bfa /indra/newview/llstartup.cpp | |
parent | 04ebc11a2d8a2e59abda5061e35e504fc30504d2 (diff) |
SL-16094: Clean up a bit more merge cruft.
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index df066fb7ed..adfa1b0c10 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -306,20 +306,6 @@ void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is // local classes // -void launchThreadPool() -{ - LLSD poolSizes{ gSavedSettings.getLLSD("ThreadPoolSizes") }; - LLSD sizeSpec{ poolSizes["General"] }; - LLSD::Integer size{ sizeSpec.isInteger()? sizeSpec.asInteger() : 3 }; - LL_DEBUGS("ThreadPool") << "Instantiating General pool with " - << size << " threads" << LL_ENDL; - // Use a function-static ThreadPool: static duration, but instantiated - // only on demand. - // We don't want anyone, especially the main thread, to have to block - // due to this ThreadPool being full. - static LL::ThreadPool pool("General", size, 1024*1024); -} - void update_texture_fetch() { LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread |