diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
| commit | b8fddce34d1737acf32d83dac423dbb7a948cc4a (patch) | |
| tree | adf4c05ab3a42b2d3fed8fbda23c2de97840bab7 /indra/viewer_components | |
| parent | f73b795bb709b3060e06b4238ae4dac702f21301 (diff) | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
Diffstat (limited to 'indra/viewer_components')
| -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; |