summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-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.cpp1
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);
}