diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/viewer_components/updater/llupdateinstaller.h | |
parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) |
merge changes for storm-806
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? // |