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-09-05SL-11315 Viewer asks to play media and retains selected choiceandreykproductengine
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
2016-02-26MAINT-5699 Graphics preset changes to None each time the Advanced Graphics ↵AndreyL ProductEngine
floater is opened
2015-12-02SL-238 WIP - added checkbox for enhanced skeleton.Brad Payne (Vir Linden)
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-13merge changes for 3.8.5-releaseOz Linden
2018-04-20MAINT-8540 Eliminated a lot of xui related log warnings on startup and ↵andreykproductengine
opening preferences
2015-09-11MAINT-5537 FIXED Advanced Graphics Preferences sliders are incorrect if you ↵Mnikolenko ProductEngine
click Cancel rather than OK
2015-06-23MAINT-5001 FIXED Logging in and then quickly logging out removes stored ↵Mnikolenko ProductEngine
favorite login locations
2015-06-03MAINT-1788 FIXED Cancel changes when clicking Close button or exiting Viewer.Mnikolenko ProductEngine
2015-02-23STORM-2082 Clicking on Ok/Cancel in Advanced floater only closes it nowJonathan Yap
2015-02-21merge impostor and visual muting changesOz Linden
2015-02-20Clean up impostors and visual mutingOz Linden
Rename the settings that control them to be more descriptive Remove the separate boolean setting (RenderUseImpostors) that governed both Establish default values based on gpu class for impostors and visual muting
2015-02-18STORM-2082 Fix issue with isDirtyJonathan Yap
2015-02-11STORM-2082 Attempt to put advanced settings into separate floaterJonathan Yap