summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2022-05-11SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-03-07Match error message updated on server side for SL-16869Brad Kittenbrink
2022-02-18SL-16869 Removed unused LoginFailedAuthenticationFailedMFA message id.Brad Kittenbrink
2022-01-14SL-16654 simplify MFA token prompt UI to use notifications instead of new ↵Brad Kittenbrink
custom floater.
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-08-20DRTVWR-534: collection of minor UI tweaks and fixes via XUI changesCallum Prentice
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-01SL-15512 Update text in the Favorites Bar and Favorites windowMnikolenko Productengine
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' (DRTVWR-514) into DRTVWR-518-uiAndrey Kleshchev
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-30SL-15050 Change name of toolbar button to "Guidebook"Mnikolenko Productengine
2021-03-16SL-14938 Remove Library and Inventory from Places floaterMnikolenko Productengine
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-08Revert "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-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-23SL-12475 Add the way to reset current Favorites foldersMnikolenko Productengine
2021-02-03SL-14796 After teleporting, add notation into Nearby ChatAndrey Kleshchev
2020-11-24SL-13612 Dedicated Avatar menu -- Revise toolbar button labelsMnikolenko Productengine
2020-11-06SL-14203 add menu items to open Linden Homes and Premium Membership web pagesMnikolenko Productengine
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-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-23SL-13814 Updated label textMnikolenko Productengine
2020-09-23 SL-13823 FIXED "Settings" are not shown in Inventory filter messageMnikolenko 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' 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 ↵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-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-09-09SL-12475 add Inventory Favorites tabmaxim_productengine
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp
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
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-23SL-6109 Mouse localization supportandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 09:22:53 +0000