diff options
author | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
commit | 4d22c32aa9ac42b4a720200386d68339e8656974 (patch) | |
tree | c84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/viewer_components/updater/llupdatedownloader.h | |
parent | 73e6711268adb93025386ffb766055125f0d849e (diff) | |
parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) |
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/viewer_components/updater/llupdatedownloader.h')
-rwxr-xr-x[-rw-r--r--] | indra/viewer_components/updater/llupdatedownloader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/llupdatedownloader.h b/indra/viewer_components/updater/llupdatedownloader.h index 0d635640cf..f759988f12 100644..100755 --- a/indra/viewer_components/updater/llupdatedownloader.h +++ b/indra/viewer_components/updater/llupdatedownloader.h @@ -54,7 +54,9 @@ public: // Start a new download. void download(LLURI const & uri, std::string const & hash, + std::string const & updateChannel, std::string const & updateVersion, + std::string const & info_url, bool required=false); // Returns true if a download is in progress. |