summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-22Fix line endingsAndrey Lihatskiy
2024-05-22Merge pull request #1545 from Ansariel/DRTVWR-600-maint-AAndrey Lihatskiy
Merge main into DRTVWR-600-maint-a
2024-05-22Adjust Copy3rdPartyLibs.cmake for Visual Studio 2022 17.10.0 and greaterAnsariel
2024-05-22Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ↵Ansariel
into DRTVWR-600-maint-A # Conflicts: # indra/llcommon/llpredicate.h # indra/newview/lldrawpoolavatar.cpp # indra/newview/llinventorybridge.cpp
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
2024-05-22Merge pull request #1539 from secondlife/nat/kwdsnat-goodspeed
Change `LLPredicate::Rule::requires()` to `mandates()` for C++20.
2024-05-22Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwdsNat Goodspeed
2024-05-22Bring over .xz compression from main, instead of .bz2.Nat Goodspeed
The main branch, and the current rev of viewer-build-util, consistently uses .xz for tarballs.
2024-05-22triage#59 Fix missed 'static' declarationsAndrey Kleshchev
2024-05-21Update to viewer-build-util@v2 utilities.Nat Goodspeed
Without this, the viewer build fails to post Windows symbols.
2024-05-21Change 'LLPredicate::Rule::requires()' to 'mandates()' for C++20.Nat Goodspeed
Although 'requires' appears in many comments and some string literals, and 'concept' in a few of each, LLPredicate::Rule appears to be the only use of any new C++20 reserved word in the existing code base. And it seems to be unreferenced.
2024-05-21viewer#1520 Material upload floater displays wrong upload feeAndrey Kleshchev
2024-05-20#1392 GLTF Upload (#1394)Dave Parks
* #1392 WIP -- Functional texture upload, stubbed out .bin upload. * #1392 GLTF Upload WIP -- Emulates successful upload Successfully uploads texture Emulates successful .gltf and .bin upload by injecting into local asset cache. Emulates rez from inventory by setting sculpt ID of selected object Currently fails in tinygltf parsing due to missing .bin * Add missing notification * Build fix * #1392 Add boost::json .gltf reading support. * #1392 boost::json GLTF writing prototype * Create gltf/README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * #1392 Add ability to render directly from LL::GLTF::Material * Fix for mac build * Mac build fix * #1392 AssetType and Inventory Type plumbing * #1392 More sane error handling and scheduling of uploads. * #1392 Actually attempt to upload glbin * Mac build fix, upload nudge * Mac build fix * Fix glTF asset uploads to server * Mac build fix (inline not static) * More consistent inline * Add glm, mac nudge. * #1392 For consistency with spec, start using glm over glh:: and LLFoo * Another attempt at placating Mac builds * Another Mac nudge * Mac build take 23 * #1392 Prune LLMatrix4a from GLTF namespace. * #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw) * #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering * #1392 Working download! * #1394 Add support for GLTFEnabled SimulatorFeature * #1392 Review feedback --------- Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-20Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-05-20triage#59 Render Friends Only optionAndrey Kleshchev
An option for performance testing, video recording or taking photos, so that unexpected people won't appear in your photos or tests.
2024-05-17viewer#1501 Crash initiating screenSpaceReflUtil.glslAndrey Kleshchev
Error: Function return is not matching type
2024-05-17viewer#1117 Use attachment info to prevent accidental nudity #2Andrey Kleshchev
Discard null id attachments
2024-05-16Merge pull request #1489 from secondlife/brad/fix-mac-channelBrad Linden
Fix channel detection for mac builds
2024-05-16Merge pull request #1486 from secondlife/brad/workflow-dispatch-releasenat-goodspeed
Experiment with getting manually triggered workflow builds to optionally do a release
2024-05-16Merge pull request #1462 from secondlife/nat/releaseosnat-goodspeed
Run ReleaseOS builds, but only when a release page is requested.
2024-05-15Merge branch 'brad/fix-mac-channel' into release/materials_featuretteBrad Linden
2024-05-15Fix channel detection for mac buildsBrad Linden
2024-05-15Merge pull request #1488 from secondlife/brad/gltf-dev-featurttes-mergecosmic-linden
brad/gltf dev featurttes merge
2024-05-15Merge commit '29be88d60d654193926add496d2d851f7c217356' into ↵Brad Linden
project/gltf_development
2024-05-15Merge pull request #1487 from secondlife/v-1474cosmic-linden
secondlife/viewer#1474: Remove small texture offset from PBR terrain
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15Move all release_run logic into setvar job.Brad Linden
2024-05-16Merge pull request #1478 from secondlife/marchcat/x-mf-mergeAndrey Lihatskiy
Maint X -> Materials Featurette merge
2024-05-15secondlife/viewer#1474: Fix broken shader compilationCosmic Linden
2024-05-15Experiment with getting manually triggered workflow builds to optionally do ↵Brad Linden
a release
2024-05-15Streamline the new workflow `RELEASE_RUN` logic a little.Nat Goodspeed
Since downstream jobs reference the output of the new `setvar` job, instead of directly referencing global `env.RELEASE_RUN`, no need to set `RELEASE_RUN` in the global environment.
2024-05-16Merge branch 'release/materials_featurette' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15#1267 Fix for alpha cutoff of zero and base color factor alpha of zero ↵Dave Parks
making objects disappear (#1485)
2024-05-15jira-archive-internal#67837 Windows' bulk export of snapshots and texturesAndrey Kleshchev
Properly sanitize names Better duplicate avoidance
2024-05-15Merge branch 'main' into nat/releaseos following Maint X promotionNat Goodspeed
2024-05-15Merge commit 'e7eced3' into nat/releaseos for whitespace fix.Nat Goodspeed
2024-05-15Make env.RELEASE_RUN the empty string if falseNat Goodspeed
not the string "false", which is true.
2024-05-15Can't reference global env in job.if either.Nat Goodspeed
2024-05-15Try to work around workflow YAML env setting limitation.Nat Goodspeed
2024-05-15#1466 Loosen clamp on haze glow to fix skies that want to be bonkers (#1470)Dave Parks
2024-05-15secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working ↵Alexander Gavriliuk
as expected
2024-05-15Merge pull request #1482 from secondlife/v-1474cosmic-linden
secondlife/viewer#1474: Remove small texture offset from PBR terrain
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15#1457 Fix the tests on macAndrey Lihatskiy
(cherry picked from commit 82d713782529074b03720833038cb0df2b8bcffd)
2024-05-15Merge branch 'release/maint-x' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-15Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15triage#49 Menu didn't work for already selected itemsAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-23 05:33:20 +0000