summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2024-06-14Merge pull request #1747 from megapahit/beaconBrad Linden
Fixes secondlife/viewer#999 lltracker beacon performance issue
2024-06-14Linux build fix (#1774)Andrey Lihatskiy
2024-06-14Fix for warnings/errors after Visual Studio update (#1775)Dave Parks
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-14Revert "Replace LL_X11 and LL_FLTK to LL_LINUX"AiraYumi
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-13secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when ↵Cosmic Linden
insufficient permissions
2024-06-13lltracker::drawbeacon() rewritted for better performancemobserveur
this is a better implementation of the drawBeacon() function compared to the previous patch
2024-06-13fixed tracker beacon performance issue on apple silicon macsmobserveur
tracking beacon was causing extreme lag on apple silicon macs
2024-06-13Fix a few merge issuesAnsariel
2024-06-12Fix whitespace pre-commit hook failuresBrad Linden
2024-06-12Fixup more signed/unsigned warnings after merge.Brad Linden
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-12Merge pull request #1724 from secondlife/v-1475cosmic-linden
secondlife/viewer#1475: PBR Terrain texture transform UI: Second pass
2024-06-12viewer#1672 Crash at setDefaultFOVAndrey Kleshchev
Some things can make a copy of camera, like LLViewerWindow::cubeSnapshot so need to store and clean up the connection
2024-06-12viewer#1731 Crash at LLPipeline::markVisibleAndrey Kleshchev
mDrawable pointer had junk in it
2024-06-12viewer#1730 Crash in LLFetchedGLTFMaterial::bindAndrey Kleshchev
2024-06-12viewer#1728 Crash in LLViewerRegion::probeCacheAndrey Kleshchev
2024-06-12viewer#1698 Uniform being out of range shouldn't crash viewerAndrey Kleshchev
2024-06-12viewer#1692 Crash at LLVOVolume::getReflectionProbeIsBox()Andrey Kleshchev
2024-06-12viewer#1733 UI overlap in advanced settingsAndrey Kleshchev
2024-06-12Replace LL_X11 and LL_FLTK to LL_LINUXAiraYumi
2024-06-11Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
2024-06-11secondlife/viewer#1475: PBR Terrain texture transform UI: Second passCosmic Linden
2024-06-11Merge remote-tracking branch 'origin/release/maint-a' into ↵Brad Linden
project/gltf_development
2024-06-11Fixed signed/unsigned warnings after they got enabled in the maint-A mergeBrad Linden
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-11Fix some apparent previous merge errorAnsariel
2024-06-11Fix possible null pointer access crashAnsariel
2024-06-11Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
2024-06-11Windows build fix following #1695Andrey Lihatskiy
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-10Merge branch 'main' into brad/materials_featurette_build_workaroundNat Goodspeed
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development
2024-06-10Merge remote-tracking branch 'origin/main' into project/gltf_developmentBrad Linden
2024-06-11Re-enable compiler warnings C4127, C4512 & C4706Ansariel
Disable particular CRT and WinSock API warnings for functions Microsoft considers unsafe/deprecated
2024-06-10#1677 Add GLTF extensions serialization and support for KHR_materials_unlit ↵Dave Parks
(#1686)
2024-06-10Increment viewer version to 7.1.9Nat Goodspeed
following promotion of secondlife/viewer #648: Release/materials featurette
2024-06-10Merge release/materials_featurette to main on promotion of secondlife/viewer ↵Nat Goodspeed
#648: Release/materials featurette
2024-06-10Attempted workaround for actions/runner-images#10004 build failures.Brad Linden
2024-06-10Fix merge error introduced in eb526fec0aadcaf30363fdfb1e253a609bf83accAnsariel
2024-06-10Merge pull request #1667 from secondlife/v-1475cosmic-linden
secondlife/viewer#1475: Add PBR terrain repeats editing
2024-06-10secondlife/viewer#1475: Fix whitespace and remove commentCosmic Linden
2024-06-10Post-merge - trim trailing whitespaceAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 18:53:55 +0000