From 1bb955db354d8cbd142e96d57c90d2a0eaed6f05 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 1 Apr 2019 19:57:00 +0200
Subject: [PATCH] [FIXED] Can't run the viewer from within Visual Studio
without also building the installer -> Updater executable isn't copied to
the build directory
--HG--
branch : Viewer-Build
---
indra/newview/llappviewer.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index aefb82ff721..096ff8376fd 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1134,6 +1134,9 @@ bool LLAppViewer::init()
gGLActive = FALSE;
+// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-6.0
+#ifdef LL_RELEASE_FOR_DOWNLOAD
+// [/SL:KB]
LLProcess::Params updater;
updater.desc = "updater process";
// Because it's the updater, it MUST persist beyond the lifespan of the
@@ -1161,7 +1164,10 @@ bool LLAppViewer::init()
// Run the updater. An exception from launching the updater should bother us.
LLLeap::create(updater, true);
-
+// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-6.0
+#endif // LL_RELEASE_FOR_DOWNLOAD
+// [/SL:KB]
+
// Iterate over --leap command-line options. But this is a bit tricky: if
// there's only one, it won't be an array at all.
LLSD LeapCommand(gSavedSettings.getLLSD("LeapCommand"));
--
GitLab