summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
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-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
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)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
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-10SL-11215 Release notes url should be an urlAndrey Kleshchev
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-01-27SL-14423 Ctrl+Alt+Shift+A is assigned to 2 thingsAndrey Kleshchev
Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
2021-01-27SL-14424 Remove shortcut that conflicts with camera controlsAndrey Kleshchev
2021-01-26SL-14651 Keybinding's panel combobox can cause confusionAndrey Kleshchev
2021-01-14SL-14283 When updater is missing, viewer fails to launch silentlyAndrey Kleshchev
2020-11-26Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build floater"Mnikolenko Productengine
2020-11-24Revert "SL-13479 Dedicated top-level menu for avatar editing"Andrey Lihatskiy
This reverts commit ca6bb3506d13975bd5a817a09658fa78d7716cc6.
2020-11-24Revert "SL-13479 Avatar menu tweaks"Andrey Lihatskiy
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2.
2020-11-24Revert "SL-13612 Dedicated Avatar menu -- Revise toolbar button labels"Andrey Lihatskiy
This reverts commit ad3f7252229e476f6e85f7b5d274aa6ee362fce1.
2020-11-23SL-14370 Don't init inventory views if they aren't neededAndrey Kleshchev
These views are 'heavy' and rarely used, don't init them all the time.
2020-11-23DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507Andrey Kleshchev
See changes from SL-13119 and SL-13190
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-12SL-13278 Restored missing propertiesAndrey Lihatskiy
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-06Reapplied SL-11215: Add release notes URLs to update-related notifications.Andrey Kleshchev
In scope of SL-13740 work, this reverts commit 1935d25c78bf46f0fdc8758b6f215f53d17fd94a.
2020-11-05SL-14275: Add two new Water Reflection modes to Graphics AdvancedPtolemy
2020-10-23SL-14050 remove references to viewer-helpMnikolenko Productengine
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
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-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 09:55:09 +0000