summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2020-09-09Revert "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-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-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey 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-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)
DRTVWR-481 Merge
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 ↵Mnikolenko Productengine
upload fees
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
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2019-08-14SL-11674 Update bulk upload warningmaxim_productengine
2019-07-22SL-10453 Unhelpful error message when trying to join a group you are already ↵andreykproductengine
a member of
2019-06-14SL-11361 Moving folder to My Outfits should create an outfitandreykproductengine
2019-06-06SL-11358 FIXED [EEP] Setting type name and other strings are missing.maxim_productengine
2019-05-22SL-10984 [EEP] Add a toolbar button to open My Environmentsmaxim_productengine
2019-05-21MergeAnchor
2019-05-21Merge viewer-release 6.2.3Graham Linden
2019-05-21Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-05-17SL-11213 No longer embedding the channel in the viewer release note urls. ↵Steven Harrison (steven)
Update base URLs to match new viewer release note URL
2019-05-10MergeAnchor
2019-05-08Merge viewer-releaseGraham Linden
2019-04-30MergeAnchor
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merged in lindenlab/viewer-release (EAM)AndreyL ProductEngine
2019-02-15SL-10550 Update attachment location stringsmaxim_productengine
2019-01-30SL-9925: Viewer now shows an error message if import from legacy windlight ↵Rider Linden
fails.
2019-01-08SL-10268, SL-10323: Use _script_perm to display sit and change env ↵Rider Linden
questions. Exp log messages for environment changes."
2018-12-12INTL-324 added support for TLS failure dialog localizationAndreyL ProductEngine