diff options
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 23 | ||||
| -rw-r--r-- | indra/newview/llpresetsmanager.h | 6 |
3 files changed, 26 insertions, 7 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 06388b1728..cfaafeb496 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2474,6 +2474,10 @@ void LLPanelPreferenceGraphics::setPresetText() if (!preset_graphic_active.empty()) { + if (preset_graphic_active == PRESETS_DEFAULT) + { + preset_graphic_active = LLTrans::getString("Default"); + } preset_text->setText(preset_graphic_active); } else diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 8aad37e505..152001eb46 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -134,9 +134,14 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& dir, preset_nam presets = mPresetNames; } -bool LLPresetsManager::savePreset(const std::string& subdirectory, const std::string& name) +bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string name) { - bool saved = false; + if (LLTrans::getString(PRESETS_DEFAULT) == name) + { + name = PRESETS_DEFAULT; + } + + bool saved = false; std::vector<std::string> name_list; if(PRESETS_GRAPHIC == subdirectory) @@ -244,8 +249,13 @@ void LLPresetsManager::setPresetNamesInComboBox(const std::string& subdirectory, } } -void LLPresetsManager::loadPreset(const std::string& subdirectory, const std::string& name) +void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string name) { + if (LLTrans::getString(PRESETS_DEFAULT) == name) + { + name = PRESETS_DEFAULT; + } + std::string full_path(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml"); LL_DEBUGS() << "attempting to load preset '"<<name<<"' from '"<<full_path<<"'" << LL_ENDL; @@ -270,8 +280,13 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, const std::st } } -bool LLPresetsManager::deletePreset(const std::string& subdirectory, const std::string& name) +bool LLPresetsManager::deletePreset(const std::string& subdirectory, std::string name) { + if (LLTrans::getString(PRESETS_DEFAULT) == name) + { + name = PRESETS_DEFAULT; + } + bool sts = true; if (PRESETS_DEFAULT == name) diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h index ce640b49b1..ac4f0c010c 100644 --- a/indra/newview/llpresetsmanager.h +++ b/indra/newview/llpresetsmanager.h @@ -56,9 +56,9 @@ public: static std::string getPresetsDir(const std::string& subdirectory); void setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo, EDefaultOptions default_option); void loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets, EDefaultOptions default_option); - bool savePreset(const std::string& subdirectory, const std::string & name); - void loadPreset(const std::string& subdirectory, const std::string & name); - bool deletePreset(const std::string& subdirectory, const std::string& name); + bool savePreset(const std::string& subdirectory, std::string name); + void loadPreset(const std::string& subdirectory, std::string name); + bool deletePreset(const std::string& subdirectory, std::string name); // Emitted when a preset gets loaded, deleted, or saved. boost::signals2::connection setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb); |