Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-04-01 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵ | Brad Payne (Vir Linden) | |
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5. | |||
2021-03-02 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2020-10-07 | Add in some cache stats for the about box | Callum Prentice | |
2020-10-06 | Remove SQLite from project and we are now not going to use it for the cache | Callum Prentice | |
2020-09-28 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp | |||
2020-09-22 | Add SQLite third package to this viewer and pull in the most recent build (3.33) | Callum Prentice | |
2020-09-22 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-09-22 | Merged master(DRTVWR-503) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-09-16 | First part of change to remove LLVFS from the Viewer. Consists of code ↵ | Callum Prentice | |
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. | |||
2020-09-09 | Revert "SL-12475 add Inventory Favorites tab" | Andrey Lihatskiy | |
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h | |||
2020-09-02 | SL-13890 Show appropriate message for empty 'Marketplace Listings' tabs | Mnikolenko Productengine | |
2020-08-27 | SL-13835 Typo | Andrey Kleshchev | |
2020-08-27 | SL-13835 Fixed warning for certificate | Andrey Kleshchev | |
2020-08-21 | SL-13835 SSL verification should not crash on invalid certificate | Andrey Kleshchev | |
2020-07-29 | SL-13695 update chat message string with instructions | Mnikolenko Productengine | |
2020-06-24 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h | |||
2020-06-23 | Reverted SL-6109 keybinding changes | Andrey Kleshchev | |
Changes were moved to DRTVWR-514 | |||
2020-06-23 | SL-6109 Mouse localization support | andreykproductengine | |
2020-05-05 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml | |||
2020-04-29 | Merge branch 'DRTVWR-500' into DRTVWR-501-maint | Andrey Lihatskiy | |
2020-03-28 | Merge branch 'master' into DRTVWR-501-maint | Andrey Lihatskiy | |
2020-03-18 | Merge master (v 6.3.9) into DRTVWR-440 | Dave Houlton | |
2020-02-05 | SL-12660 Hide top level domain name and IP address for simulators | Mnikolenko Productengine | |
2020-02-03 | Merge branch 'DRTVWR-501' into trunk | Andrey Lihatskiy | |
2020-02-03 | Merge branch 'DRTVWR-500' into DRTVWR-501 | Andrey Lihatskiy | |
2020-01-28 | DRTVWR-440, merge in latest from 6.3.7 release | Dave Houlton | |
2020-01-28 | Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into ↵ | Brad Payne (Vir Linden) | |
DRTVWR-481 Merge | |||
2020-01-27 | SL-12475 add Inventory Favorites tab | maxim_productengine | |
2019-12-16 | Merge viewer-release 6.3.6 into viewwer-eep repo | Dave Houlton | |
2019-12-16 | merge | Brad Payne (Vir Linden) | |
2019-11-27 | Merged in pe_devs/494-wassail | AndreyL ProductEngine | |
2019-11-26 | SL-12100, SL-12317 - benefits handling fixes | Brad Payne (Vir Linden) | |
2019-11-25 | SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and Sound ↵ | Mnikolenko Productengine | |
upload fees | |||
2019-11-22 | SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work | andreykproductengine | |
2019-11-13 | SL-11964 Removed SL Share from the viewer | AndreyL ProductEngine | |
2019-11-12 | SL-6109 Mouse localization support | andreykproductengine | |
2019-10-16 | merge | Brad Payne (Vir Linden) | |
2019-09-10 | Merge viewer-release 6.3.2 | Graham Linden | |
2019-09-05 | Upstream merge from viewer-neko | AndreyL ProductEngine | |
2019-09-05 | Merged in lindenlab/viewer-bear | AndreyL ProductEngine | |
2019-09-05 | Merged in lindenlab/viewer-lynx | AndreyL ProductEngine | |
2019-08-26 | Merge 6.3.1 viewer-release | Graham Linden | |
2019-08-26 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-08-15 | SL-209 Cleanup Merchant Outbox | andreykproductengine | |
2019-08-14 | SL-11674 Update bulk upload warning | maxim_productengine | |
2019-07-22 | SL-10453 Unhelpful error message when trying to join a group you are already ↵ | andreykproductengine | |
a member of |