Merge pull request #255 from AlchemyViewer/fix-updater-stall

RyeMutt · web-flow · commit 6b78dbce2d4f · 2025-10-06T11:58:20.000-04:00
Fix remnants of linden updater stalling out startup/login
diff --git a/indra/cmake/ViewerManager.cmake b/indra/cmake/ViewerManager.cmake
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1188,10 +1188,11 @@ bool LLAppViewer::init()`
`1188`	`1188`	`}`
`1189`	`1189`	`}`
`1190`	`1190`	`else`
	`1191`	`+#endif //LL_RELEASE_FOR_DOWNLOAD`
`1191`	`1192`	`{`
	`1193`	`+ mUpdaterNotFound = true;`
`1192`	`1194`	`LL_WARNS("InitInfo") << "Skipping updater check." << LL_ENDL;`
`1193`	`1195`	`}`
`1194`		`-#endif //LL_RELEASE_FOR_DOWNLOAD`
`1195`	`1196`
`1196`	`1197`	`{`
`1197`	`1198`	`// Iterate over --leap command-line options. But this is a bit tricky: if`