summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
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-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
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-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
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' into DRTVWR-519Callum Prentice
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code change...Callum Prentice
2020-09-09Revert "SL-12475 add Inventory Favorites tab"Andrey Lihatskiy
2020-09-02SL-13890 Show appropriate message for empty 'Marketplace Listings' tabsMnikolenko Productengine
2020-08-27SL-13835 TypoAndrey Kleshchev
2020-08-27SL-13835 Fixed warning for certificateAndrey Kleshchev
2020-08-21SL-13835 SSL verification should not crash on invalid certificateAndrey Kleshchev
2020-07-29SL-13695 update chat message string with instructionsMnikolenko Productengine
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
2020-06-23SL-6109 Mouse localization supportandreykproductengine
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-02-05SL-12660 Hide top level domain name and IP address for simulatorsMnikolenko Productengine
2020-02-03Merge branch 'DRTVWR-501' into trunkAndrey Lihatskiy
2020-02-03Merge branch 'DRTVWR-500' into DRTVWR-501Andrey Lihatskiy
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-28Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into ...Brad Payne (Vir Linden)
2020-01-27SL-12475 add Inventory Favorites tabmaxim_productengine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-16mergeBrad Payne (Vir Linden)
2019-11-27Merged in pe_devs/494-wassailAndreyL ProductEngine
2019-11-26SL-12100, SL-12317 - benefits handling fixesBrad Payne (Vir Linden)
2019-11-25SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and Sound uploa...Mnikolenko Productengine
2019-11-22SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Workandreykproductengine
2019-11-13SL-11964 Removed SL Share from the viewerAndreyL ProductEngine
2019-11-12SL-6109 Mouse localization supportandreykproductengine
2019-10-16mergeBrad Payne (Vir Linden)
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-05Upstream merge from viewer-nekoAndreyL ProductEngine
2019-09-05Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-09-05Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-26Merged in lindenlab/viewer-releaseAndreyL ProductEngine