summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.h
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 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
2019-05-08Fix merge by putting back loadFromFilename.Graham Linden
2019-05-08Merge 6.2.2Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
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-01-03SL-10293 Firestorm PR: preferences and menu searchAndreyL ProductEngine
2018-12-18Merge viewer-release 6.0.2Graham Linden
2018-12-13MergeRider Linden
2018-10-24SL-1828 Indicate that "Allow Multiple Viewers" Preference is unsupportedmaxim_productengine
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-02Merge viewer-releaseGraham Linden
2018-06-21Merge 5.1.7Graham Linden
2018-06-18MAINT-8759 FIXED [Win] Choosing new cache location will cause disconnect if ↵maxim_productengine
you do not choose desired path in File picker quickly
2018-01-12STORM-2145 Merge up to viewer-releaseJonathan Yap
2017-06-06MAINT-7254, MAINT-7255: Use cap to get and set UserInfo on simhost. Check ↵Rider Linden
new is_verified flag and disable IM2Email if value is false.
2017-02-23STORM-2145 Camera Presets -- some initial workJonathan Yap
2017-03-15MAINT-7168 Avatar rendering settings adjustmentsMnikolenko Productengine
2017-01-17MAINT-6959 Ability to set custom folders for uploading itemsandreykproductengine
2016-10-21MAINT-6841 - more removal of the include enhanced skeleton toggleBrad Payne (Vir Linden)
2016-05-21merged jelly-doll viewer-release into bentoBrad Payne (Vir Linden)
2016-05-04add max avatar complexity slider to basic graphics preferencesOz Linden
2016-03-09Merged in andreyl_productengine/391-blizzard-marchcat (pull request #23)Oz Linden
MAINT-6174 FIXED Graphics parameters are wrong after closing the Advanced Graphics floater
2016-03-07merge DRTVWR-398 build cleanup fixesOz Linden
2016-03-01MAINT-6174 FIXED Graphics parameters are wrong after closing the Advanced ↵AndreyL ProductEngine
Graphics floater
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 05:36:34 +0000