From 877b80d0a314cd307e7c2435f4db04b693fd785b Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Mon, 6 Oct 2025 09:47:52 -0400
Subject: [PATCH] Fix remnants of linden updater stalling out startup/login

---
 indra/cmake/ViewerManager.cmake | 3 ---
 indra/newview/CMakeLists.txt    | 1 -
 indra/newview/llappviewer.cpp   | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 indra/cmake/ViewerManager.cmake

diff --git a/indra/cmake/ViewerManager.cmake b/indra/cmake/ViewerManager.cmake
deleted file mode 100644
index 7150ffc4d17..00000000000
--- a/indra/cmake/ViewerManager.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include (Prebuilt)
-use_prebuilt_binary(viewer-manager)
-
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ce135a4f63b..f5c17524c22 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -41,7 +41,6 @@ include(ThreeJS)
 include(Tracy)
 include(UI)
 include(ViewerMiscLibs)
-include(ViewerManager)
 include(VisualLeakDetector)
 include(ZLIBNG)
 include(LLPrimitive)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9b622c5704d..1602b1cba5c 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1188,10 +1188,11 @@ bool LLAppViewer::init()
         }
     }
     else
+#endif //LL_RELEASE_FOR_DOWNLOAD
     {
+        mUpdaterNotFound = true;
         LL_WARNS("InitInfo") << "Skipping updater check." << LL_ENDL;
     }
-#endif //LL_RELEASE_FOR_DOWNLOAD
 
     {
         // Iterate over --leap command-line options. But this is a bit tricky: if