diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2018-01-16 18:02:47 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2018-01-16 18:02:47 -0500 |
| commit | 23925816774eaf5baf0756f32435c32db408370f (patch) | |
| tree | 911495b02b7e4dff6d6878321595be7d81a9d0ce /indra/newview | |
| parent | 9c7b634ba60d7a0b3687472ce22f7bbfd3e28010 (diff) | |
STORM-2145 Deal with preset files with spaces correctly
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/Camera/Pennys Gamer.xml (renamed from indra/newview/app_settings/Camera/Pennys%20Gamer.xml) | 0 | ||||
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/Camera/Pennys%20Gamer.xml b/indra/newview/app_settings/Camera/Pennys Gamer.xml index 5d249153a0..5d249153a0 100644 --- a/indra/newview/app_settings/Camera/Pennys%20Gamer.xml +++ b/indra/newview/app_settings/Camera/Pennys Gamer.xml diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index be6dd89aba..ec4f5fd864 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -137,6 +137,7 @@ std::string LLPresetsManager::getPresetsDir(const std::string& subdirectory) if (found) { std::string source = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "Camera", file); + file = LLURI::escape(file); std::string dest = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR, "Camera", file); LLFile::copy(source, dest); } |