diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
commit | 69b6aa5db2034e8e34bd234a4ebf04763419933a (patch) | |
tree | 5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/viewer_components/updater/llupdateinstaller.h | |
parent | 1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff) | |
parent | 12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff) |
merge changes for storm-669
Diffstat (limited to 'indra/viewer_components/updater/llupdateinstaller.h')
-rw-r--r-- | indra/viewer_components/updater/llupdateinstaller.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/viewer_components/updater/llupdateinstaller.h b/indra/viewer_components/updater/llupdateinstaller.h index 6ce08ce6fa..fe5b1d19b5 100644 --- a/indra/viewer_components/updater/llupdateinstaller.h +++ b/indra/viewer_components/updater/llupdateinstaller.h @@ -42,9 +42,10 @@ enum LLInstallScriptMode { // that the current application terminate once this function is called. // int ll_install_update( - std::string const & script, // Script to execute. - std::string const & updatePath, // Path to update file. - LLInstallScriptMode mode=LL_COPY_INSTALL_SCRIPT_TO_TEMP); // Run in place or copy to temp? + std::string const & script, // Script to execute. + std::string const & updatePath, // Path to update file. + bool required, // Is the update required. + LLInstallScriptMode mode=LL_COPY_INSTALL_SCRIPT_TO_TEMP); // Run in place or copy to temp? // |