summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'release/maint-b' into pipewire-linux-volume-catcherMaki
2024-05-15Merge branch 'main' into marchcat/x-b-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/ConfigurePkgConfig.cmake # indra/cmake/ICU4C.cmake # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h # indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h # indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llfloateremojipicker.cpp # indra/newview/lloutfitslist.cpp
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-19Add toggle for PipeWire volume catcher, and refactoringMaki
2024-04-17Fix typo in settings names (#1257)Ansariel Hiller
2024-04-15Fix broken shaders due to 72730609f371ae0417a2d117fdc9d805ce8858fbAnsariel
2024-04-12Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# Conflicts: # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/lltexturefetch.cpp
2024-04-10Fix linux some shader errors when running under WSL, related to ↵Brad Linden
secondlife/viewer#1149 (#1170)
2024-03-27Post-merge cleanup (settings.xml)Andrey Lihatskiy
2024-03-27Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/llui/lltransutil.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloaterenvironmentadjust.cpp # indra/newview/llpaneleditwater.cpp # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h
2024-03-27Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml
2024-03-04Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/llstring.cpp # indra/llcommon/llstring.h
2024-03-01Merge remote-tracking branch 'origin/main' into release/gltf-maint2Brad Linden
2024-03-01Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-02-07Issue #56 Redirect Help>Report Bug to Canny instead of JiraAndrey Kleshchev
2024-01-24SL-20669 Move constants out of settings.xmlAndrey Kleshchev
UIImgInvisibleUUID doesn't exist Default normal for material is 'null'
2024-01-17SL-18429 Make it so auto adjusting legacy skies merely turns on tonemapping.RunitaiLinden
2024-01-12SL-20629 Fix Probe ambiance being displayed as 0 when it isn'tAndrey Kleshchev
And hide warning when it's already 0
2024-01-08Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/llmaterialeditor.cpp
2024-01-08Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-01-08Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-XAndrey Kleshchev
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2023-12-14SL-20611 Followup -- fix for depth based atmospheric mask making ↵RunitaiLinden
atmospherics effect sun/moon/clouds
2023-12-14Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601RunitaiLinden
2023-12-14SL-20730 Patch another potential source of NaNsRunitaiLinden
2023-12-13Merge pull request #578 from sldevel/HUD-fixcosmic-linden
Fix for semi-transparent HUDs rendering opaque
2023-12-13SL-20730 Scrub nans from haze alphaRunitaiLinden
2023-12-12Fix for semi-transparent HUDs rendering opaqueHenri Beauchamp
This commit fixes a bug introduced with commit 6472b75bcd70470fe5775d1cf6eb70a75b3d76e5 where the fullbrightF.glsl shader fails to set color.a to final_alpha for HUDs.
2023-12-11SL-20611 Followup -- fix for artifacts on water surface from GPUs that don't ↵Dave Parks
like to read from a depth buffer that is bound for writing
2023-12-05SL-20654 Fix for box probes sometimes glitching out at the corners. ↵RunitaiLinden
Incidental fix for crash when mWaterPool is null.
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-12-04SL-20611 Followup -- fix edge cases with transparent PBR objects around ↵RunitaiLinden
eye/object above/below water.
2023-12-04SL-20611 Followup -- fix edge cases with transparent objects around ↵RunitaiLinden
eye/object above/below water.
2023-11-30Merge branch 'DRTVWR-596' into davep/SL-20611RunitaiLinden
2023-11-30SL-20611 Incorporate water haze into new post effect atmospherics goodnessRunitaiLinden
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-11-21SL-20563 Add 'No Post' option to Snapshot floaterAlexander Gavriliuk
2023-11-17SL-20611 followup -- remove now unused glsl files. Fix transparent water.RunitaiLinden
2023-11-16SL-20611 Make haze effect local lights -- move sky and water haze to their ↵RunitaiLinden
own passes and unify sky and water haze in forward rendering shaders.
2023-11-03SL-20567 Default HiDPI off (mac performance improvement)RunitaiLinden
2023-10-25Merge pull request #471 from secondlife/SL-20065cosmic-linden
SL-20065: Hack to reduce black spots on shiny water
2023-10-24SL-20065: Hack to reduce black spots on shiny waterCosmic Linden
2023-10-23SL-13610 [MAC] Manufacturer based searchAndrey Kleshchev
2023-10-17Update settings.xmlJonathan "Geenz" Goodman
SL-20154
2023-10-17Fix for SL-19283Jonathan "Geenz" Goodman
2023-10-11SL-20450: Fix missing LSL keyword INVENTORY_MATERIALCosmic Linden
2023-10-11SL-20440 Followup -- balance PBR point light with legacy point lightRunitaiLinden
2023-10-11SL-20440 Followup -- fix for non-normalized vector and balance PBR spotlight ↵RunitaiLinden
with legacy spotlight
2023-10-11SL-20440 Fix for projector ambiance destroying PBR shading. Also fix ↵RunitaiLinden
longstanding bug with hard line in projector ambiance lighting. Incidental decruft of legacy_adjust and LOCAL_LIGHT_KILL, etc.