diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-12-12 13:45:05 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-12-12 13:45:05 -0600 |
| commit | 9e1383f90d45622e0b9848be2608a4a6d71037dd (patch) | |
| tree | 03ad6ab945d10569ad1bbe89fef4c2276dd759e6 /indra/llrender | |
| parent | 1915b7a008a171e9b193f6301e83b61ca0f3c433 (diff) | |
| parent | 4e0d8f15644d607d4f9db4452cf4f34140eb2ca7 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index d16757d0ed..7162134c92 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -2404,7 +2404,7 @@ void LLImageGL::checkActiveThread() LLImageGLThread::LLImageGLThread(LLWindow* window) // We want exactly one thread. - : ThreadPool("LLImageGL", 1) + : LL::ThreadPool("LLImageGL", 1) , mWindow(window) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; @@ -2412,7 +2412,7 @@ LLImageGLThread::LLImageGLThread(LLWindow* window) mFinished = false; mContext = mWindow->createSharedContext(); - ThreadPool::start(); + LL::ThreadPool::start(); } void LLImageGLThread::run() @@ -2422,7 +2422,7 @@ void LLImageGLThread::run() // WorkQueue, likewise cleanup afterwards. mWindow->makeContextCurrent(mContext); gGL.init(false); - ThreadPool::run(); + LL::ThreadPool::run(); gGL.shutdown(); mWindow->destroySharedContext(mContext); } |