summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2018-01-18 17:13:07 -0500
committerJonathan Yap <jhwelch@gmail.com>2018-01-18 17:13:07 -0500
commit9954d8d82391a129ca2c4c9fe9a339bc80bc0817 (patch)
tree400889ba18301700f4733b53c39f082e898ca3fb /indra/newview
parent96481c159335cf27f5c49d842f6df6f35000209c (diff)
STORM-2145 Use string constant rather than a hardcoded string.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpresetsmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index ec4f5fd864..8b0a05984d 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -126,7 +126,7 @@ std::string LLPresetsManager::getPresetsDir(const std::string& subdirectory)
if (PRESETS_CAMERA == subdirectory)
{
- std::string source_dir = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "Camera");
+ std::string source_dir = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, PRESETS_CAMERA);
LLDirIterator dir_iter(source_dir, "*.xml");
bool found = true;
while (found)
@@ -136,9 +136,9 @@ std::string LLPresetsManager::getPresetsDir(const std::string& subdirectory)
if (found)
{
- std::string source = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "Camera", file);
+ std::string source = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, PRESETS_CAMERA, file);
file = LLURI::escape(file);
- std::string dest = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR, "Camera", file);
+ std::string dest = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR, PRESETS_CAMERA, file);
LLFile::copy(source, dest);
}
}