diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
commit | a9caa3151cea77b992c06c5a774d333ffd3016e1 (patch) | |
tree | 330cee487295788c500bcd7096a125120a10ae75 /indra/viewer_components/updater/llupdateinstaller.h | |
parent | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (diff) | |
parent | ef1c3aac889d118530994e878d83426d4fc2ca7c (diff) |
merge fix for storm-411
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? // |