push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,16 @@
--- a/src/utils/slpaths.cpp
+++ b/src/utils/slpaths.cpp
@@ -165,13 +165,10 @@
usync_paths.push_back(bundle);
}
if (!SlPaths::IsPortableMode()) {
- /*
-//FIXME: reenable when #707 is fixed / spring 102.0 is "established"
LSL::SpringBundle systembundle;
if (LSL::SpringBundle::LocateSystemInstalledSpring(systembundle)) {
usync_paths.push_back(systembundle);
}
-*/
std::vector<std::string> paths;
PossibleEnginePaths(paths);