summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-12SL-18190 Remove water reflection detail combo box and reimplement ↵Dave Parks
"Transparent Water" checkbox.
2022-09-27SL-18202 impostor too slow avatars and add autotune settings button to ↵Mnikolenko Productengine
Preference
2022-09-23SL-18202 remove old autofpsMnikolenko Productengine
2022-09-21SL-18202 WIP merging autotune contribution and updating UIMnikolenko Productengine
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-16Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-09-16SL-18128 Clear out much OpenGL cruft and switch to core profile on AMDDave Parks
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-15SL-18161 Add PBR materials to Uploads in preferencesAndrey Kleshchev
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-08-08SL-17927 Keep people from shooting themselves in the foot by twiddling ↵Dave Parks
deprecated settings.
2022-08-03SL-17706 Deprecate RenderGamma and RenderFogRatio and remove dead UI from ↵Dave Parks
graphics preferences.
2022-08-03SL-17706 Deprecate avatar cloth and remove dead UI from graphics preferences.Dave Parks
2022-08-02SL-17851 Highlight matching notifications when using Search Box in PreferenceMnikolenko Productengine
2022-07-20SL-17569 restore previous list of ignored notifications after pressing the ↵Mnikolenko Productengine
Cancel button
2022-06-15SL-17584 Frame buffer object is now nessesary to run viewerAndrey Kleshchev
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-24SL-17472 Add checkbox to preferences for enabling "PBR" that uses "class3" ↵Dave Parks
deferred shaders. Move reflection probe shaders to class3 and restore class2 shaders to non-reflection probe versions.
2022-05-18SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219Nat Goodspeed
Update task branch from main project branch.
2022-05-08SL-16937 Replace sendAvatarPropertiesUpdate with profile cap in preferencesAndrey Kleshchev
To avoid data loss, old api trims profile descriptions
2022-04-26SL-15383 Controls table was empty after canceling advanced graphical settingsAndrey Kleshchev
Also causes crashes on SearchableControl::setHighlighted due to views not being there
2022-04-26Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18SL-15312 Small tweaks for profilesAndrey Kleshchev
2022-04-15SL-17219 WIP - Texture pipeline overhaulDave Parks
2022-03-02Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-01-25SL-16627 add auto-adjustment warning for affected settingsMnikolenko Productengine
2022-01-24SL-16627 build fixMnikolenko Productengine
2022-01-24SL-16627 AutoFPS first passMnikolenko Productengine
2022-01-21Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539Runitai Linden
# Conflicts: # indra/llcommon/lltracerecording.h # indra/newview/llfloaterpreference.cpp
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-30SL-16369 Remove Hardware Skinning settingMnikolenko Productengine
2021-11-30SL-16119 Viewer should now direct IM 2 Email setting to webMnikolenko Productengine
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 16:32:43 +0000