summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
2021-02-17Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-11-13Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-10-20SL-14142 - impostor management cleanupBrad Payne (Vir Linden)
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-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-08-18Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-07-09SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not ↵Mnikolenko Productengine
synchronized after closing Advanced settings via Close btn
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23SL-6109 Teleport and autopilot should not work in some casesAndrey Kleshchev
Hides teleport_to and walk_to also optimizes couple things.
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-23SL-13469 Fixed use of wrong clear functionAndrey Kleshchev
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 Separated some sitting-exclusive controlsAndrey Kleshchev
2020-06-23SL-13421 Removed camera control keybindings from mouselookAndrey Kleshchev
2020-06-23SL-6109 localization support for control tableandreykproductengine
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-6109 Now changes are applied on the go and reverted on cancelandreykproductengine
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 LMB DLMB in progressandreykproductengine
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-17SL-13469 Fixed use of wrong clear functionAndrey Kleshchev
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 Separated some sitting-exclusive controlsAndrey Kleshchev
2020-06-12SL-13421 Removed camera control keybindings from mouselookAndrey Kleshchev
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18SL-12007 Missed transparent water in LLFloaterPreferenceAndrey Kleshchev
2020-05-13SL-12007 Toggling 'Transparent water' checkbox has no effectAndrey Kleshchev
Opaque water is not compatible with ALM
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
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-03-25SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not ↵Mnikolenko Productengine
synchronized after closing Advanced settings
2020-03-19SL-12871 'Only Friends and Groups can call or IM me' setting should be ↵Mnikolenko Productengine
account based.
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-02-03Merge branch 'DRTVWR-501' into trunkAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 12:16:48 +0000