summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2023-02-08Merge branch 'xcode-14.1' into DRTVWR-489-emojiKitty Barnett
2023-01-26DRTVWR-489-emoji: Pull in some small changes from Kitty's work to move the ma...Callum Prentice
2023-01-20Fix merge conflicts after auto mergeCallum Linden
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-10-23Add mini emoji (auto-)complete helperKitty Barnett
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and enable...Andrey Kleshchev
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-28Merge branch 'contribution/emoji'Kitty Barnett
2022-07-20SL-17670 remove tab charactersMnikolenko Productengine
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
2022-06-06SL-15312 Larger image previewAndrey Kleshchev
2022-05-31SL-15312 Tweaks and fixesAndrey Kleshchev
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-02-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-01-27SL-16717 Rename RenderGLCoreProfile to prevent compatibility issuesAndrey Kleshchev
2022-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2022-01-11SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-03SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey te...Dave Parks
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-24DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.Nat Goodspeed
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
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-15Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"Dave Houlton
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-11-10SL-16094: Statically link to Windows IMM32.LIB.Nat Goodspeed
2021-11-04SL-16299 fix warning about CFBundleIdentifier not matching PRODUCT_BUNDLE_IDE...Brad Kittenbrink
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-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-13Merge with master after latest Viewer releaseCallum Linden
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 01:35:31 +0000