summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2021-04-14Revert "SL-14800 Clarify message when maturity level exceeded"Mnikolenko Productengine
This reverts commit 36064412c68468ebd6818c8409c7e59a72f050c8.
2021-04-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/lltoolpie.cpp
2021-03-09Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey 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-522-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-02SL-14800 Clarify message when maturity level exceededMnikolenko Productengine
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
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-12SL-13278 Restored missing propertiesAndrey Lihatskiy
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-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-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-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
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-25SL-12962 rename remained stringsMnikolenko 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' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-17Remove references to VFS in the non-English language XML files (already ↵Callum Prentice
removed from English (en) versions)
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 06:24:59 +0000