summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
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
2020-01-31SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not ↵maxim_productengine
synchronized on different floaters while editing
2020-01-29SL-12594, remove conditional checks for VertexShaderEnable settingsDave Houlton
2020-01-29SL-12594, rename some lingering VertexShaderEnable variablesDave Houlton
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
2020-01-08SL-12509 FIXED The Load, Save, and Delete preset floaters aren't opened ↵Mnikolenko Productengine
together in the graphics preferences
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-13SL-12271 FIXED Notifications are cropped after moving them to the 'Never ↵maxim_productengine
show' box
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-10SL-6109 localization support for control tableandreykproductengine
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-30SL-6109 Now changes are applied on the go and reverted on cancelandreykproductengine
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