diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
| commit | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch) | |
| tree | 9a22b0583bb290a242df3c619665fdb692e1ecef /indra/viewer_components/updater/llupdateinstaller.h | |
| parent | 86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff) | |
| parent | 49de8add8355455da4b6ec5aaa55427fafa94322 (diff) | |
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
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? // |