diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 18:46:51 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 18:46:51 +0300 |
| commit | 955bcbb95106e9c0c5d8b75c42c32dde52cc0bb6 (patch) | |
| tree | 663ad1c3e33c002ee7ea1bfa5c86d2b713839aba /indra/viewer_components/updater/llupdateinstaller.cpp | |
| parent | bb085a45db845a9bfe8aae83ecc7938f618e9ddc (diff) | |
| parent | 08c0de785f29801c57feebce8fae593f86113777 (diff) | |
Merge mesh-development with sh-2309
Diffstat (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp')
| -rw-r--r-- | indra/viewer_components/updater/llupdateinstaller.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index c7b70c2de8..24ba00ad8e 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -26,6 +26,7 @@ #include "linden_common.h" #include <apr_file_io.h> #include "llapr.h" +#include "llscopedvolatileaprpool.h" #include "llprocesslauncher.h" #include "llupdateinstaller.h" #include "lldir.h" @@ -45,7 +46,8 @@ namespace { { std::string scriptFile = gDirUtilp->getBaseFileName(path); std::string newPath = gDirUtilp->getExpandedFilename(LL_PATH_TEMP, scriptFile); - apr_status_t status = apr_file_copy(path.c_str(), newPath.c_str(), APR_FILE_SOURCE_PERMS, gAPRPoolp); + LLScopedVolatileAPRPool pool; + apr_status_t status = apr_file_copy(path.c_str(), newPath.c_str(), APR_FILE_SOURCE_PERMS, pool); if(status != APR_SUCCESS) throw RelocateError(); return newPath; |