diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
| commit | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch) | |
| tree | c405316265ca4248802817b8a99697063c58469d /indra/viewer_components/updater/llupdateinstaller.h | |
| parent | 2d9c970babf6bab8d402482315af6be0ffb198dd (diff) | |
| parent | 78895f9e0c628dc33268578faf135e967cf30142 (diff) | |
merge changes for storm-398
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? // |