diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 13:48:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 13:48:35 -0700 |
| commit | 29415d140777a25704ac06973c6cf467c30c994b (patch) | |
| tree | 8ea879ff5b839b2894e332ed72ff9702784949a0 /indra/viewer_components/updater/llupdateinstaller.cpp | |
| parent | 1f0cc074823b299ed77b3d6e90e4e8f4ea60415f (diff) | |
| parent | ef490e308ccce8e6df85144784a0f4580f5ac6a1 (diff) | |
Merge
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 d450c068ad..6aa87d1be6 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; |