summaryrefslogtreecommitdiff
path: root/indra/newview/llsetkeybinddialog.h
AgeCommit message (Collapse)Author
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-09-17SL-15594 Ignore voice keys when keybinding is waiting for a keyAndrey Kleshchev
2021-04-12SL-15107 Fix some typos in llsetkeybinddialogAndrey Kleshchev
2020-12-04SL-14438 Adjusted behavior of recording mask keysAndrey Kleshchev
If 'mask+key' got rejected, don record it as 'mask'
2020-12-02SL-14438 Fixed Viewer lost ability to assign Masks as keysAndrey Kleshchev
2020-06-23SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵andreykproductengine
conflicts
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-6109 Fixed conflict resolution issue caused by menu acceleratorsandreykproductengine
2020-06-23SL-6109 Remade 'ignore' list processing, renamed and reformed keybindingsandreykproductengine
2020-06-23SL-6109 Better menu accelerator support and slight reorganizationandreykproductengine