summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2022-05-05Merge branch 'master' v 6.5.6 into DRTVWR-528Dave Houlton
2022-04-18Merge branch 'master' into DRTVWR-528Dave Houlton
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-29SL-16831 Fix unit testAndrey Kleshchev
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2022-02-08Merge branch 'DRTVWR-555' into DRTVWR-553+555Andrey Lihatskiy
2022-01-31SL-13792: Use new Python 3 SLVersionChecker.Nat Goodspeed
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-528 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-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-11-18SL-16235 Restart music in case of an errorAndrey Kleshchev
2021-11-16Merge branch 'master' v6.5.1 into DRTVWR-528Dave 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-12DRTVWR-528 Reverting multiple commits due to moving them into D546 branchAndrey Kleshchev
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-22Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-10-22Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-10-14Merge branch 'master' into DRTVWR-545-maint-mixAndrey Lihatskiy
2021-10-13Merge branch 'master' into DRTVWR-528Dave Houlton
2021-09-29SL-13934 Crash at saveToFileAndrey Kleshchev
2021-09-21Revert "SL-11841 make ‘Push to talk’ the default setting"Andrey Kleshchev
2021-09-21SL-11841 Fix PushToTalkToggle being set incorectlyAndrey Kleshchev
2021-09-18SL-11841 Fix PushToTalkToggle being set incorectlyAndrey Kleshchev
2021-09-15SL-15993 Disabling transparent water should not disable advanced lightingAndrey Kleshchev
2021-09-03SL-15902 Cleanup gSecAPIHandlerMnikolenko ProductEngine
2021-09-03DRTVWR-545 Megre fixAndrey Kleshchev
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
2021-09-01SL-15872 fixed more cases where sUseFBO wasn't updated correctlyMnikolenko Productengine
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-08-09SL-15773 Don't try to remove breakpad minidump if it's not neededMnikolenko Productengine
2021-08-06SL-15696 Don't be so persistent with outdated driver notificationAndrey Kleshchev
2021-07-30SL-443 Remove legacy keybindings codeAndrey Kleshchev
2021-07-20DRTVWR-521 post-merge build fixAndrey Lihatskiy
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' v 6.4.22 into DRTVWR-528Dave Houlton