summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Collapse)Author
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-05-25SL-15285 Restore 'drop item' functionality in right click menuAndrey Kleshchev
2021-05-25SL-15298 Move Landmark's Edit buttonAndrey Kleshchev
2021-05-12Revert "SL-15168 Changed format"Andrey Kleshchev
2021-05-11SL-15168 Reset title of guidebook when openingAndrey Kleshchev
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
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-28SL-15174 set Starting Guidebook location on-screenMnikolenko Productengine
2021-04-23SL-14842 Tooltip for clear historyAndrey Kleshchev
2021-04-22SL-14842 Clear history should be it's own buttonAndrey Kleshchev
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-21SL-14842 Clear history button was in wrong menuAndrey Kleshchev
2021-04-20SL-14906 Fix LLFloaterHowTo overriding stored positionAndrey Kleshchev
preferred_media_size was repositioning the floater
2021-04-20SL-15028 Update menu items on the login screenMnikolenko Productengine
2021-04-17SL-14906 More adjustments to guidebookAndrey Kleshchev
The Guidebook should remember it's open/closed state between sessions. The Guidebook button should show as pressed while the Guidebook is open.
2021-04-15SL-15118 Search link in People floater should open Search but not submit a ↵Mnikolenko Productengine
search.
2021-04-14SL-14800 Clarify message when maturity level exceededMnikolenko Productengine
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge conflict: restored lost part of SL-13479Andrey Kleshchev
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-04-01SL-15053 Use previous icon for Nearby chatMnikolenko Productengine
2021-03-31SL-14990 ig75icd64 and other intel crashesAndrey Kleshchev
Obsolete driver detection
2021-03-30SL-15050 Change name of toolbar button to "Guidebook"Mnikolenko Productengine
2021-03-30SL-15036 Add actions to move landmarks between tabs in the Places floaterMnikolenko Productengine
2021-03-29SL-15034 Revisions to dedicated Avatar menusAndrey Kleshchev
2021-03-29Separate "Save changes" and "Save as..." in Outfits floaterMnikolenko Productengine
2021-03-29SL-14900 remove created landmark when clicking Cancel buttonMnikolenko Productengine
2021-03-25SL-15028 Guidebook floaterMnikolenko Productengine
2021-03-23SL-14900 new Landmark creation flowMnikolenko Productengine
2021-03-18SL-14901 adjusted 'More' buttonMnikolenko Productengine
2021-03-16SL-14938 Remove Library and Inventory from Places floaterMnikolenko Productengine
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-10SL-14901 Updated button according to new specMnikolenko 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-05SL-14931 Change messaging on empty lists in People floaterMnikolenko Productengine
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
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-03-01SL-13609 Don't use any icon for Nearby chatMnikolenko Productengine
2021-02-26SL-14612 Wording improvement for hitting TP throttleAndrey Kleshchev
Teleport uses teleport_strings.xml, updating noifications.xml as well in case it can be triggered by server directly.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 00:22:04 +0000