summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
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 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-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-08SL-12186 WIP Revert Preferences changesmaxim_productengine
2019-09-16DRTVWR-493 LLLogChat to singletonandreykproductengine
2019-09-05SL-11315 Viewer asks to play media and retains selected choiceandreykproductengine
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-08-09SL-9699 Login selectionandreykproductengine
2019-07-03DRTVWR-493 LLAvatarNameCache to singletoneandreykproductengine
2019-07-18SL-11592 [Mac] Ability to bind extra mouse buttons for push to talkandreykproductengine
2019-07-18SL-11592 [Win] Ability to bind extra mouse buttons for push to talkandreykproductengine
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2019-05-08Fix merge by putting back loadFromFilename.Graham Linden
2019-05-08Merge 6.2.2Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-04-02Merge 6.1.2Graham Linden
2019-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-03-12Backout tabs v spaces changes.Graham Linden
'warn-on-failure:no-tabs'
2019-03-11Tabs -> spaces.Graham Linden
2019-02-15SL-10234 Fixed The viewer shows installation language as system defaultandreykproductengine
2019-02-27SL-10566 part the fourthGraham Linden
Fix water rendering causing distortion map update very frame. Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness). Add ability to retrieve current user clip plane so it can be saved/restored around water map gen. Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again. Re-enable occlusion in distortion map rendering.
2019-01-03SL-10293 Firestorm PR: preferences and menu searchAndreyL ProductEngine
2018-12-18Merge viewer-release 6.0.2Graham Linden
2018-12-13MergeRider Linden
2018-12-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-12-04mac build fixAndreyL ProductEngine
2018-12-04SL-10149 FIXED 'Mute when minimized' checkbox is displayed without focus on ↵maxim_productengine
it after pressing on label in the "Preferences" floater
2018-12-03SL-10150 'Preset in use' shows last used preset name after deleting itmaxim_productengine
2018-11-26SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functionsruslantproductengine
SL-10019 - [Mac] [Render] Right-click context menu immediately disappears when clicking any place in the ‘Inventory’ floater SL-9984 - [Retina] Camera frustum, do not display correctly on "WORLD MAP" window. SL-10027 - [Mac] [Render] Add toggle for Retina support to mitigate FPS loss Re-FIX for Retina support.
2018-10-24SL-1828 Indicate that "Allow Multiple Viewers" Preference is unsupportedmaxim_productengine
2018-09-26MergeRider Linden
2018-09-26Merge to 5.2.0Graham Linden
2018-09-11Hide UI related to advanced atmospherics and make it off by default again.Graham Linden
2018-09-10MAINT-9116 XUI Cleanupandreykproductengine
2018-09-12SL-1397 FIXED Check mark doesn't switch when clicking on the label "Mute ↵maxim_productengine
when minimized" in Preferences
2018-09-10First pass at preferences and feature table hookup for advanced atmospherics.Graham Linden
2018-08-15mac build fixMnikolenko ProductEngine
2018-08-14MAINT-8930 FIXED Using "Reset all to recommended settings" still shows the ↵maxim_productengine
last active preset as "Preset in use" in the UI
2018-08-02Merge viewer-releaseGraham Linden