From 1774489ef8c224359e39d6281497e5128b043d24 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 16 Dec 2010 09:34:19 -0800 Subject: Vary install failed message depending on whether it was required or not. --- indra/viewer_components/updater/llupdateinstaller.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp') diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index 6e69bcf28b..fe1e493e82 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -25,6 +25,7 @@ #include "linden_common.h" #include +#include #include "llapr.h" #include "llprocesslauncher.h" #include "llupdateinstaller.h" @@ -47,7 +48,10 @@ namespace { } -int ll_install_update(std::string const & script, std::string const & updatePath, LLInstallScriptMode mode) +int ll_install_update(std::string const & script, + std::string const & updatePath, + bool required, + LLInstallScriptMode mode) { std::string actualScriptPath; switch(mode) { @@ -73,6 +77,7 @@ int ll_install_update(std::string const & script, std::string const & updatePath launcher.setExecutable(actualScriptPath); launcher.addArgument(updatePath); launcher.addArgument(ll_install_failed_marker_path().c_str()); + launcher.addArgument(boost::lexical_cast(required)); int result = launcher.launch(); launcher.orphan(); -- cgit v1.2.3 From b707048fdfbc9bbcc3efa5d21c1e5142527ad267 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 17 Dec 2010 10:53:02 -0800 Subject: fix windows build (suppress warning from lexical_cast) --- indra/viewer_components/updater/llupdateinstaller.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp') diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index fe1e493e82..d4fbc82523 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -23,6 +23,9 @@ * $/LicenseInfo$ */ +#pragma warning(disable: 4702) // disable 'unreachable code' so we can use lexical_cast (really!). + + #include "linden_common.h" #include #include -- cgit v1.2.3 From 049815bd528daaa7d9f09043304c4dc6f4a030f0 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 17 Dec 2010 10:55:09 -0800 Subject: and don't break other builds. --- indra/viewer_components/updater/llupdateinstaller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp') diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index d4fbc82523..0928cb64e9 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -23,8 +23,9 @@ * $/LicenseInfo$ */ +#if defined(LL_WINDOWS) #pragma warning(disable: 4702) // disable 'unreachable code' so we can use lexical_cast (really!). - +#endif #include "linden_common.h" #include -- cgit v1.2.3 From 67a543aa6cc50d8a0b46a1b4e9dd82cdd676cdc1 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 17 Dec 2010 12:07:09 -0800 Subject: ich bin stupid; this should actually fix the windows build. --- indra/viewer_components/updater/llupdateinstaller.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp') diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index 0928cb64e9..d3347d330a 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -23,10 +23,6 @@ * $/LicenseInfo$ */ -#if defined(LL_WINDOWS) -#pragma warning(disable: 4702) // disable 'unreachable code' so we can use lexical_cast (really!). -#endif - #include "linden_common.h" #include #include @@ -36,6 +32,11 @@ #include "lldir.h" +#if defined(LL_WINDOWS) +#pragma warning(disable: 4702) // disable 'unreachable code' so we can use lexical_cast (really!). +#endif + + namespace { class RelocateError {}; -- cgit v1.2.3 From 2c68cb2c69348522ebb648aa4abd2ca7e4038b80 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 20 Dec 2010 10:38:36 -0800 Subject: fix windows build? --- indra/viewer_components/updater/llupdateinstaller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp') diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index d3347d330a..d450c068ad 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -25,7 +25,6 @@ #include "linden_common.h" #include -#include #include "llapr.h" #include "llprocesslauncher.h" #include "llupdateinstaller.h" @@ -35,6 +34,7 @@ #if defined(LL_WINDOWS) #pragma warning(disable: 4702) // disable 'unreachable code' so we can use lexical_cast (really!). #endif +#include namespace { -- cgit v1.2.3