summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2024-06-28Merge remote-tracking branch 'origin/release/webrtc-voice' into developBrad Linden
# Conflicts: # indra/newview/llvoicechannel.cpp
2024-06-28fps limiter setting in app_settings.xmlmobserveur
MaxFPS settings type and description changed
2024-06-271836 dont store texture in system memory unless absolutely necessary (#1843)Dave Parks
* #1836 Texture memory usage overhaul. Much decrufting - don't keep a copy of textures in system memory - use GPU to downrez textures instead of reloading from cache - use GPU to generate brightness/darkness bumpmaps
2024-06-27Merge pull request #1840 from secondlife/inventory_favoritesAndrey Kleshchev
viewer#1300 viewer#1301 viewer#1424 viewer#1425 viewer#1619 viewer#1005
2024-06-27Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voiceErik Kundiman
2024-06-26Increase texture discard bias if system memory gets lowAnsariel
2024-06-21Disable voice morphing and throw up a warning if it's previously enabled.Roxie Linden
2024-06-21#1769 gltf optimization pass (#1816)Dave Parks
#1814 and #1517 Fix mirror update rate and occlusion culling
2024-06-20viewer#1501 Crash initiating screenSpaceReflUtil.glslAndrey Kleshchev
Error: Function return is not matching type
2024-06-20Merge remote-tracking branch 'secondlife/release/maint-b' into maint-bErik Kundiman
2024-06-17Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-developBrad Linden
2024-06-17Fix shaders broken in mergeAnsariel
2024-06-15commands.xml: chat adjustmentfowlerdm
Make "Chat" toolbat button match "Conversations" floater title.
2024-06-141736 audit texture image unit usage on os x (#1739)Dave Parks
* #1736 Remove some unused samplers from glsl files and refactor shader manager to assume 16 texture image units and 4 indexed texture units all the time.
2024-06-14Merge branch 'release/maint-b' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl # indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl # indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl # indra/newview/llfilepicker.cpp
2024-06-13Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
2024-06-13secondlife/viewer#907: Remove unused settingCosmic Linden
2024-06-13secondlife/viewer#907: Review feedbackCosmic Linden
2024-06-13secondlife/viewer#1744: Fix missing LSL constant INVENTORY_SETTING in ↵Cosmic Linden
keywords_lsl_default.xml
2024-06-13More of making operands consistently floatErik Kundiman
2024-06-12Fix whitespace pre-commit hook failuresBrad Linden
2024-06-12settings.xml: Change default camera presetfowlerdm
trick from digital pastures
2024-06-12Float operands for float clamp operationErik Kundiman
2024-06-12Merge remote-tracking branch 'origin/project/gltf_development' into ↵Brad Linden
brad/maint-a-merge-to-gltf-dev # Conflicts: # indra/newview/gltf/primitive.cpp
2024-06-11Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
2024-06-11Merge remote-tracking branch 'origin/release/maint-a' into ↵Brad Linden
project/gltf_development
2024-06-11#1718 Add GLTF support for multiple texcoords (#1720)Dave Parks
* Fix for GLTF MeshPrimitiveModes test
2024-06-11#1687 Add support for KHR_texture_transform (#1717)Dave Parks
2024-06-11Trim remaining trailing whitespaces after #1695Andrey Lihatskiy
2024-06-11Clean up line endings that got mangled up during last mergeAnsariel
2024-06-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llrendertarget.cpp # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp
2024-06-11Merge branch 'main' (featurette) into inventory_favoritesAndrey Kleshchev
2024-06-11Merge tag '7.1.8-release'Erik Kundiman
source for viewer 7.1.8.9375512768
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development
2024-06-11Merge branch 'main' into marchcat/c-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llviewermenufile.cpp
2024-06-10Merge pull request #1667 from secondlife/v-1475cosmic-linden
secondlife/viewer#1475: Add PBR terrain repeats editing
2024-06-10Post-merge - trim trailing whitespaceAndrey Lihatskiy
2024-06-10Merge main into inventory_favoritesAndrey Kleshchev
# Conflicts: # indra/llui/llfolderviewmodel.h # indra/newview/llpanelwearing.cpp # indra/newview/llwearableitemslist.cpp
2024-06-10#1654 generate normals and tangents according to gltf specification (#1662)Dave Parks
* Disable unloading of objects in background. * Add unlit GLTF shader variant
2024-06-10Re-enable compiler warnings C4018, C4100, C4231 and C4506Ansariel
2024-06-08NavbarShowCoordinates: 1fowlerdm
Enable show coordinates by default
2024-06-07secondlife/viewer#1475: Add PBR terrain repeats editingCosmic Linden
2024-06-07Highlight friend nametagsfowlerdm
How did this get disabled?
2024-06-05#1527 Improve performance on Apple silicon (#1632)Dave Parks
2024-06-04Fixup mix->pbr_mix after merge.Brad Linden
2024-06-04Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Brad Linden
project/gltf_development
2024-06-04#989 Fix for blurry terrain on Mac (#1633)Brad Linden
Co-authored-by: Dave Parks <davep@lindenlab.com>
2024-06-04Fix for AMD not being able to load pbrmetallicroughnessV. (#1620)Jonathan "Geenz" Goodman
2024-06-04#1614 Fix for moire pattern in specular highlights. Incidental cleanup.RunitaiLinden
2024-06-02More float operands for float operationsErik Kundiman