diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 0defe4937a..8a3833c357 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -154,7 +154,10 @@ std::string LLPresetsManager::getPresetsDir(const std::string& subdirectory) { 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, PRESETS_CAMERA, file); + // FIRE-19810: Make presets global since PresetGraphicActive setting is global as well + //std::string dest = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR, PRESETS_CAMERA, file); + std::string dest = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, PRESETS_DIR, PRESETS_CAMERA, file); + // LLFile::copy(source, dest); } } @@ -411,7 +414,7 @@ bool LLPresetsManager::setPresetNamesInComboBox(const std::string& subdirectory, std::list preset_names; loadPresetNamesFromDir(presets_dir, preset_names, default_option); - std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive"); + //std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive"); // Unused if (preset_names.begin() != preset_names.end()) {