summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Expand)Author
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-04-01SL-15053 Use previous icon for Nearby chatMnikolenko Productengine
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and re...Callum Prentice
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ...Brad Payne (Vir Linden)
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-01SL-13609 Don't use any icon for Nearby chatMnikolenko Productengine
2021-02-10SL-11215 Release notes url should be an urlAndrey Kleshchev
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master in...Andrey Kleshchev
2021-01-27SL-14423 Ctrl+Alt+Shift+A is assigned to 2 thingsAndrey Kleshchev
2021-01-27SL-14424 Remove shortcut that conflicts with camera controlsAndrey Kleshchev
2021-01-26SL-14651 Keybinding's panel combobox can cause confusionAndrey Kleshchev
2021-01-14SL-14283 When updater is missing, viewer fails to launch silentlyAndrey Kleshchev
2020-11-26Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build floater"Mnikolenko Productengine
2020-11-24Revert "SL-13479 Dedicated top-level menu for avatar editing"Andrey Lihatskiy
2020-11-24Revert "SL-13479 Avatar menu tweaks"Andrey Lihatskiy
2020-11-24Revert "SL-13612 Dedicated Avatar menu -- Revise toolbar button labels"Andrey Lihatskiy
2020-11-23SL-14370 Don't init inventory views if they aren't neededAndrey Kleshchev
2020-11-23DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507Andrey Kleshchev
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-11-12SL-13278 Restored missing propertiesAndrey Lihatskiy
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-11-06Reapplied SL-11215: Add release notes URLs to update-related notifications.Andrey Kleshchev
2020-10-23SL-14050 remove references to viewer-helpMnikolenko Productengine
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-10-07Add in some cache stats for the about boxCallum Prentice
2020-10-06Remove SQLite from project and we are now not going to use it for the cacheCallum Prentice
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-25SL-12962 rename remained stringsMnikolenko Productengine
2020-09-22Add SQLite third package to this viewer and pull in the most recent build (3.33)Callum Prentice
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:49:55 +0000