summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-16DRTVWR-546 fix sUseFBO merge errorsDave Houlton
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
2021-12-11Merge branch 'master' into SL-15742Bennett Goble
2021-12-10SL-15742: Convert build scripts to Python 3Bennett Goble
2021-12-06SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable ...Dave Parks
2021-11-30SL-16421: Destroy the "General" ThreadPool as soon as cleanup starts.Nat Goodspeed
2021-11-30SL-16421: Unify LLAppViewer::cleanup() indentation.Nat Goodspeed
2021-11-29SL-16094: Merge branch 'DRTVWR-546' into glthreadNat Goodspeed
2021-11-29SL-16408 fixed regression - crash on exitMnikolenko Productengine
2021-11-25SL-16408 Fix for crashing on disconnectMnikolenko Productengine
2021-11-24DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.Nat Goodspeed
2021-11-23SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthreadNat Goodspeed
2021-11-20SL-16289 Rigged mesh rendering overhaulDave Parks
2021-11-19SL-16094: Service mainloop WorkQueue every LLAppViewer::idle() callNat Goodspeed
2021-11-19SL-15993 Disabling transparent water should not disable advanced lightingAndrey Kleshchev
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-11-19Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2021-11-18SL-16235 Restart music in case of an errorAndrey Kleshchev
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-11-15Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"Dave Houlton
2021-11-12SL-16220: Merge branch 'origin/DRTVWR-546' into glthreadNat Goodspeed
2021-11-12SL-15993 Disabling transparent water should not disable advanced lightingAndrey Kleshchev
2021-11-09SL-13867 Developer ability to select and reposition multiple avatarsAndrey Kleshchev
2021-11-04SL-16202: Use large WorkQueue size limits for mainloop and General.Nat Goodspeed
2021-11-04SL-16202: Streamline WorkQueues in LLImageGLThread.Nat Goodspeed
2021-11-04SL-16202: Merge branch 'sl-16220' into glthreadNat Goodspeed
2021-11-02Manually resolving conflicts after merge with DRTVWR-520Andrey Kleshchev
2021-11-02Merge remote-tracking branch 'origin/master' into DRTVWR-540-maintAndrey Kleshchev
2021-10-28SL-16235 Restart music in case of an errorAndrey Kleshchev
2021-10-28SL-15462 Convert waitForChannel() into state machineAndrey Kleshchev
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTrac...Dave Parks
2021-10-25SL-16246 protect null deferenceDave Houlton
2021-10-22mergeBrad Payne (Vir Linden)
2021-10-22SL-16220: Merge branch 'master' into sl-16220Nat Goodspeed
2021-10-22SL-16220: Add LL::ThreadPool class and a "General" instance.Nat Goodspeed
2021-10-22Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-10-22Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-10-22Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy