summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Expand)Author
2021-04-29DRTVWR-528 merge up to 6.4.19Dave Houlton
2021-04-01Merge branch 'master' into DV528-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-528Dave Houlton
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' v6.4.15 into DRTVWR-528Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
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-05SL-14074 Resolved potential cause of conversation crashesAndrey Kleshchev
2020-12-07Revert "SL-14270 Crash accessing deleted 'parent' via callback from child"Andrey Kleshchev
2020-12-03SL-6109 Crash fix for left right selection shift when nothing or whole string...Andrey Kleshchev
2020-12-03SL-14270 A bit of cleanup #3Andrey Kleshchev
2020-11-24Revert "SL-13479 Avatar menu tweaks"Andrey Lihatskiy
2020-11-23DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507Andrey Kleshchev
2020-11-21SL-14368 Expanding the 'People' floater to the right does not expand the disp...Andrey Kleshchev
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-12Mac buildfixAndrey 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-06SL-14270 Crash fixAndrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #2Andrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #1Andrey Kleshchev
2020-11-05SL-14270 Crash accessing deleted 'parent' via callback from childAndrey Kleshchev
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14DRTVWR-510 merge master 6.4.11Dave Houlton
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-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-10-07SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-06SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-02SL-14050 Remove all Help question marks from Viewer UIMnikolenko Productengine
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of new...Callum Prentice
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ll...Callum Prentice
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake script...Callum Prentice