From 4e2c1a582b1c8b2f048396756aa19e76d02799d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 May 2026 07:12:05 +0000 Subject: [PATCH 1/2] Bump github.com/microsoft/vcpkg from master to 2026.05.25 in /indra Bumps [github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) from master to 2026.05.25. This release includes the previously tagged commit. - [Release notes](https://github.com/microsoft/vcpkg/releases) - [Commits](https://github.com/microsoft/vcpkg/compare/e5a4f54c0d562059e9ccc6f7e7150667da58fe41...d015e31e90838a4c9dfa3eed45979bc70d9357fc) --- updated-dependencies: - dependency-name: github.com/microsoft/vcpkg dependency-version: 2026.05.25 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- indra/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/vcpkg.json b/indra/vcpkg.json index 9f9a5676df..e48785d252 100644 --- a/indra/vcpkg.json +++ b/indra/vcpkg.json @@ -1,5 +1,5 @@ { - "builtin-baseline": "e5a4f54c0d562059e9ccc6f7e7150667da58fe41", + "builtin-baseline": "d015e31e90838a4c9dfa3eed45979bc70d9357fc", "dependencies": [ "alchemy-branding", "alchemy-dictionaries", @@ -286,4 +286,4 @@ ] } } -} +} \ No newline at end of file From cc5b14d38b822671235e7835b8f172c684951b94 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 30 May 2026 07:12:35 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- indra/llcommon/llstring.cpp | 2 +- indra/llcommon/tests/llstring_utf_test.cpp | 2 +- indra/llrender/llfontbitmapcache.cpp | 2 +- indra/llrender/llfontbitmapcache.h | 2 +- indra/llrender/llfontface.cpp | 2 +- indra/llrender/llfontface.h | 2 +- indra/newview/lltoolcomp.cpp | 8 ++++---- indra/newview/lltoolcomp.h | 2 +- indra/vcpkg/ports/alsa/portfile.cmake | 2 +- indra/vcpkg/ports/dbus/portfile.cmake | 2 +- indra/vcpkg/ports/openjpeg/portfile.cmake | 2 +- indra/vcpkg/ports/pipewire/portfile.cmake | 2 +- indra/vcpkg/ports/pulseaudio/portfile.cmake | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index c09be32c8d..3fa54f71ad 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -8,7 +8,7 @@ * * Alchemy Viewer Source Code * Copyright (C) 2026, Rye - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; diff --git a/indra/llcommon/tests/llstring_utf_test.cpp b/indra/llcommon/tests/llstring_utf_test.cpp index 651624c2ac..e06a27f78b 100644 --- a/indra/llcommon/tests/llstring_utf_test.cpp +++ b/indra/llcommon/tests/llstring_utf_test.cpp @@ -15,7 +15,7 @@ * * Alchemy Viewer Source Code * Copyright (C) 2026, Rye - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp index 199818ef78..cf9621c201 100644 --- a/indra/llrender/llfontbitmapcache.cpp +++ b/indra/llrender/llfontbitmapcache.cpp @@ -8,7 +8,7 @@ * * Alchemy Viewer Source Code * Copyright (C) 2026, Rye - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h index c3efcb35bc..304a3b241f 100644 --- a/indra/llrender/llfontbitmapcache.h +++ b/indra/llrender/llfontbitmapcache.h @@ -8,7 +8,7 @@ * * Alchemy Viewer Source Code * Copyright (C) 2026, Rye - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; diff --git a/indra/llrender/llfontface.cpp b/indra/llrender/llfontface.cpp index e029101405..7d8232ee14 100644 --- a/indra/llrender/llfontface.cpp +++ b/indra/llrender/llfontface.cpp @@ -5,7 +5,7 @@ * $LicenseInfo:firstyear=2026&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2026, Linden Research, Inc. - * + * * Alchemy Viewer Source Code * Copyright (C) 2026, Rye * diff --git a/indra/llrender/llfontface.h b/indra/llrender/llfontface.h index aaf355c03b..ca545b0b41 100644 --- a/indra/llrender/llfontface.h +++ b/indra/llrender/llfontface.h @@ -6,7 +6,7 @@ * $LicenseInfo:firstyear=2026&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2026, Linden Research, Inc. - * + * * Alchemy Viewer Source Code * Copyright (C) 2026, Rye * diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp index 352a721311..5182d1b0f5 100644 --- a/indra/newview/lltoolcomp.cpp +++ b/indra/newview/lltoolcomp.cpp @@ -937,8 +937,8 @@ FSToolCompPose::FSToolCompPose() // Create a joint manipulator mManip = new FSManipRotateJoint(this); - // Possibly create a selection rectangle tool if you want - // to be able to box-select joints or objects + // Possibly create a selection rectangle tool if you want + // to be able to box-select joints or objects // (same usage as LLToolCompRotate does) // mSelectRect = new LLToolSelectRect(this); @@ -1021,7 +1021,7 @@ void FSToolCompPose::pickCallback(const LLPickInfo& pick_info) bool FSToolCompPose::handleMouseUp(S32 x, S32 y, MASK mask) { mMouseDown = false; - // The base LLToolComposite sets mCur->handleMouseUp(...) + // The base LLToolComposite sets mCur->handleMouseUp(...) // and does other management return LLToolComposite::handleMouseUp(x, y, mask); } @@ -1167,7 +1167,7 @@ void FSToolCompPoseTranslate::pickCallback(const LLPickInfo& pick_info) bool FSToolCompPoseTranslate::handleMouseUp(S32 x, S32 y, MASK mask) { mMouseDown = false; - // The base LLToolComposite sets mCur->handleMouseUp(...) + // The base LLToolComposite sets mCur->handleMouseUp(...) // and does other management return LLToolComposite::handleMouseUp(x, y, mask); } diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index bbaa0aaa66..e2717121d2 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -288,7 +288,7 @@ class FSToolCompPose : public LLToolComposite FSFloaterPoser* getPoserFloater(){ return mPoser; }; protected: // Tools within this composite - FSManipRotateJoint* mManip = nullptr; + FSManipRotateJoint* mManip = nullptr; LLToolSelectRect* mSelectRect= nullptr; FSFloaterPoser* mPoser = nullptr; diff --git a/indra/vcpkg/ports/alsa/portfile.cmake b/indra/vcpkg/ports/alsa/portfile.cmake index 0015715fb6..065116c276 100644 --- a/indra/vcpkg/ports/alsa/portfile.cmake +++ b/indra/vcpkg/ports/alsa/portfile.cmake @@ -1 +1 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/indra/vcpkg/ports/dbus/portfile.cmake b/indra/vcpkg/ports/dbus/portfile.cmake index 0015715fb6..065116c276 100644 --- a/indra/vcpkg/ports/dbus/portfile.cmake +++ b/indra/vcpkg/ports/dbus/portfile.cmake @@ -1 +1 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/indra/vcpkg/ports/openjpeg/portfile.cmake b/indra/vcpkg/ports/openjpeg/portfile.cmake index 558606cdf2..f7f681bc9e 100644 --- a/indra/vcpkg/ports/openjpeg/portfile.cmake +++ b/indra/vcpkg/ports/openjpeg/portfile.cmake @@ -23,7 +23,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) if(NOT VCPKG_TARGET_IS_WINDOWS AND "tools" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS + list(APPEND FEATURE_OPTIONS -DBUILD_JPIP_SERVER=ON "-DFCGI_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/fastcgi" ) diff --git a/indra/vcpkg/ports/pipewire/portfile.cmake b/indra/vcpkg/ports/pipewire/portfile.cmake index 0015715fb6..065116c276 100644 --- a/indra/vcpkg/ports/pipewire/portfile.cmake +++ b/indra/vcpkg/ports/pipewire/portfile.cmake @@ -1 +1 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/indra/vcpkg/ports/pulseaudio/portfile.cmake b/indra/vcpkg/ports/pulseaudio/portfile.cmake index 0015715fb6..065116c276 100644 --- a/indra/vcpkg/ports/pulseaudio/portfile.cmake +++ b/indra/vcpkg/ports/pulseaudio/portfile.cmake @@ -1 +1 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file +set(VCPKG_POLICY_EMPTY_PACKAGE enabled)