viewer.git/indra/llprimitive/llgltfmaterial.h, branch mainMegapahit's fork of the Second Life viewer.
https://www.megapahit.org/viewer.git/atom?h=main2026-03-07T06:55:05ZMerge tag 'Second_Life_Release#3529bc5f-2026.02' into 2026.022026-03-07T06:55:05ZErik Kundimanerik@megapahit.org2026-03-07T06:55:05Zurn:sha1:eac10375e294cd24c21c09497e838e70dcf4d74a#2975 PBR support for planar aligment2026-01-29T23:07:21ZAndrey Kleshchev117672381+akleshchev@users.noreply.github.com2026-01-28T01:43:43Zurn:sha1:98d7f697ce5d7509a4dabde877de2856e27892dd
Since checkbox is shared between pbr and normal textures, I'm making it affect both for now.
Merge tag 'Second_Life_Release#01823996-2025.08' into 2025.082025-10-25T12:03:33ZErik Kundimanerik@megapahit.org2025-10-23T04:00:12Zurn:sha1:ab9976389fe5e4c254d3eb2c39fd2dff083d8d2dFix #4195: Preserve transforms when switching PBR materials (#4725)2025-10-06T13:52:33ZAqil Ahmadaaqilahmadd@gmail.com2025-10-06T13:52:33Zurn:sha1:5fe152cfea87c04c1edf2caa7d419a056a7916a2
Fixes texture transforms being reset when switching from Blinn-Phong to PBR materials and between PBR. Previously, custom scale, offset, and rotation settings would be lost, making it tedious to switch between PBR materials.Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus2024-07-28T00:24:59ZErik Kundimanerik@megapahit.org2024-07-27T07:17:57Zurn:sha1:96a81b5ecbe3bffb582ded930752c0523df5e80aMerge remote-tracking branch 'origin/release/maint-a' into project/gltf_development2024-06-12T00:42:17ZBrad Lindenbrad@lindenlab.com2024-06-11T23:03:30Zurn:sha1:9775d7ea10ff87d913b1ba361a9204f961cd9c3fClean up line endings that got mangled up during last merge2024-06-11T13:40:09ZAnsarielansariel.hiller@phoenixviewer.com2024-06-11T13:40:09Zurn:sha1:1ebf62e102cb3f328aa90809f7f5060b8f065db1Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A2024-06-11T11:38:43ZAnsarielansariel.hiller@phoenixviewer.com2024-06-11T11:38:43Zurn:sha1:d9789bfaf230e301873bd700f6f360d306dc2486
# 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
Merge tag '7.1.8-release'2024-06-11T01:12:53ZErik Kundimanerik@megapahit.org2024-06-11T01:12:53Zurn:sha1:dedd91fdcabe5af455bbbb1cb0149aea30b0faf9
source for viewer 7.1.8.9375512768
secondlife/viewer#1475: Add PBR terrain repeats editing2024-06-08T01:14:32ZCosmic Lindencosmic@lindenlab.com2024-05-16T02:27:37Zurn:sha1:6de0086ae9c678dafa8a26eb117279a487860f2f