Skip to content

Bump github.com/microsoft/vcpkg from master to 2026.05.25 in /indra #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyeMutt merged 2 commits into from
May 30, 2026
Merged

Bump github.com/microsoft/vcpkg from master to 2026.05.25 in /indra #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e2c1a5
Bump github.com/microsoft/vcpkg from master to 2026.05.25 in /indra
dependabot[bot] May 30, 2026
cc5b14d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion indra/llcommon/llstring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Alchemy Viewer Source Code
* Copyright (C) 2026, Rye <rye@alchemyviewer.org>
*
*
* 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;
Expand Down
2 changes: 1 addition & 1 deletion indra/llcommon/tests/llstring_utf_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* Alchemy Viewer Source Code
* Copyright (C) 2026, Rye <rye@alchemyviewer.org>
*
*
* 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;
Expand Down
2 changes: 1 addition & 1 deletion indra/llrender/llfontbitmapcache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Alchemy Viewer Source Code
* Copyright (C) 2026, Rye <rye@alchemyviewer.org>
*
*
* 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;
Expand Down
2 changes: 1 addition & 1 deletion indra/llrender/llfontbitmapcache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Alchemy Viewer Source Code
* Copyright (C) 2026, Rye <rye@alchemyviewer.org>
*
*
* 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;
Expand Down
2 changes: 1 addition & 1 deletion indra/llrender/llfontface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <rye@alchemyviewer.org>
*
Expand Down
2 changes: 1 addition & 1 deletion indra/llrender/llfontface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <rye@alchemyviewer.org>
*
Expand Down
8 changes: 4 additions & 4 deletions indra/newview/lltoolcomp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/lltoolcomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions indra/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"builtin-baseline": "e5a4f54c0d562059e9ccc6f7e7150667da58fe41",
"builtin-baseline": "d015e31e90838a4c9dfa3eed45979bc70d9357fc",
"dependencies": [
"alchemy-branding",
"alchemy-dictionaries",
Expand Down Expand Up @@ -286,4 +286,4 @@
]
}
}
}
}
2 changes: 1 addition & 1 deletion indra/vcpkg/ports/alsa/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
2 changes: 1 addition & 1 deletion indra/vcpkg/ports/dbus/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
2 changes: 1 addition & 1 deletion indra/vcpkg/ports/openjpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion indra/vcpkg/ports/pipewire/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
2 changes: 1 addition & 1 deletion indra/vcpkg/ports/pulseaudio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Loading