summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.h
AgeCommit message (Collapse)Author
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-514-keymappingsAndrey Lihatskiy
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-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-23SL-13418 Move and view panel now applies changes on the goAndrey Kleshchev
2020-06-23SL-13418 Restored previously removed 'click on land' controls from 'move & view'Andrey Kleshchev
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
2020-06-23SL-13421 Removed camera control keybindings from mouselookAndrey Kleshchev
2020-06-23SL-6109andreykproductengine
- Edit mode appears to be obsolete and is not used, cleaned up - Improved ability to set defaults - Improved some labels - Made buttons bigger to accomodate languages with longer descriptions - Added ability to assign key for all modes simultaneously
2020-06-23SL-6109andreykproductengine
- Fixed defaults not restoring reliably - Fixed temporary changes not lifting reliably - Fixed switching modes was dropping changes to mode we switch to
2020-06-23SL-6109andreykproductengine
- Fixed line endings in xml file - Removed obsolete UI element and it's code - Fixed issue with return value caused by rebase
2020-06-23SL-6109 Remade 'ignore' list processing, renamed and reformed keybindingsandreykproductengine
2020-06-23SL-6109 Better menu accelerator support and slight reorganizationandreykproductengine
2020-06-23SL-6109 Removed obsolete control, moved table init to xml, cleanupandreykproductengine
2020-06-23SL-6109 Better hover and docking of keybinderandreykproductengine
2020-06-23SL-6109 Cleanup, run commands, and preparation for tooltip supportandreykproductengine
2020-06-23SL-6109 Conflict resolutionandreykproductengine
2020-06-23SL-6109 Mouse support readyandreykproductengine
2020-06-23SL-6109 Keyaboard support readyandreykproductengine
2020-06-23SL_6109 Rebindingandreykproductengine
2020-06-23SL-6109 Implement keybindingsandreykproductengine
2020-06-16SL-13418 Move and view panel now applies changes on the goAndrey Kleshchev
2020-06-15SL-13418 Restored previously removed 'click on land' controls from 'move & view'Andrey Kleshchev
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
2020-06-12SL-13421 Removed camera control keybindings from mouselookAndrey Kleshchev
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-01-29SL-12594, remove Basic Shader checksDave Houlton
Remove checks for Vertex Shader capability and UI selection of no Basic Shaders.
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-08SL-12186 WIP Revert Preferences changesmaxim_productengine
2019-11-07SL-6109andreykproductengine
- Edit mode appears to be obsolete and is not used, cleaned up - Improved ability to set defaults - Improved some labels - Made buttons bigger to accomodate languages with longer descriptions - Added ability to assign key for all modes simultaneously
2019-11-04SL-6109andreykproductengine
- Fixed defaults not restoring reliably - Fixed temporary changes not lifting reliably - Fixed switching modes was dropping changes to mode we switch to
2019-10-28SL-6109andreykproductengine
- Fixed line endings in xml file - Removed obsolete UI element and it's code - Fixed issue with return value caused by rebase
2019-10-03SL-6109 Remade 'ignore' list processing, renamed and reformed keybindingsandreykproductengine
2019-10-03SL-6109 Better menu accelerator support and slight reorganizationandreykproductengine
2019-10-02SL-6109 Removed obsolete control, moved table init to xml, cleanupandreykproductengine
2019-10-01SL-6109 Better hover and docking of keybinderandreykproductengine
2019-09-27SL-6109 Cleanup, run commands, and preparation for tooltip supportandreykproductengine
2019-09-26SL-6109 Conflict resolutionandreykproductengine
2019-09-25SL-6109 Mouse support readyandreykproductengine
2019-09-17SL-6109 Keyaboard support readyandreykproductengine
2019-09-05SL-11315 Viewer asks to play media and retains selected choiceandreykproductengine
2019-08-19SL_6109 Rebindingandreykproductengine
2019-09-19SL-6109 Implement keybindingsandreykproductengine
2019-08-09SL-9699 Login selectionandreykproductengine
2019-07-18SL-11592 [Win] Ability to bind extra mouse buttons for push to talkandreykproductengine
2019-05-08Put back new panel decl lost in merge.Graham Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:11:44 +0000