diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2015-01-14 19:55:58 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2015-01-14 19:55:58 -0500 |
| commit | d1bc2fe292edcea60b49ce8111a495974e9415a2 (patch) | |
| tree | 130d327294f0ab9cab983b012f0bf9a456c1e0c7 /indra/newview/llpresetsmanager.cpp | |
| parent | f6a1980c256474b96d5fe7943bfe1bd582826860 (diff) | |
STORM-2082 Assorted UI tweaks, better MaximumARC formula, pulldowns disappear faster
Diffstat (limited to 'indra/newview/llpresetsmanager.cpp')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 36a82db916..67d06ff5dd 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -106,14 +106,8 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& dir, preset_nam // 2 - Possibly hide the default preset if (PRESETS_DEFAULT != name) { - if (name != gSavedSettings.getString("PresetGraphicActive")) - { - mPresetNames.push_back(name); - } - else - { - mPresetNames.insert(mPresetNames.begin(), name); - } + mPresetNames.push_back(name); + } else { @@ -123,6 +117,10 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& dir, preset_nam mPresetNames.push_back(LLTrans::getString(PRESETS_DEFAULT)); break; + case DEFAULT_TOP: + mPresetNames.push_front(LLTrans::getString(PRESETS_DEFAULT)); + break; + case DEFAULT_HIDE: default: break; |