diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 15:28:13 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 15:28:13 -0600 |
commit | 86e7cc3d35e41a88b25175bafb5687e1864423d9 (patch) | |
tree | a5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/newview/llfloatersaveprefpreset.cpp | |
parent | b62d7c2f06fdaa91312fd6857d03748defe8b60f (diff) | |
parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) |
Merge branch 'master' v6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/newview/llfloatersaveprefpreset.cpp')
-rw-r--r-- | indra/newview/llfloatersaveprefpreset.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp index 5f3cf9d95b..dd47d02bfa 100644 --- a/indra/newview/llfloatersaveprefpreset.cpp +++ b/indra/newview/llfloatersaveprefpreset.cpp @@ -86,7 +86,10 @@ void LLFloaterSavePrefPreset::onBtnSave() { std::string name = mPresetCombo->getSimple(); - if ((name == LLTrans::getString(PRESETS_DEFAULT)) || (name == PRESETS_DEFAULT)) + std::string upper_name(name); + LLStringUtil::toUpper(upper_name); + + if ((name == LLTrans::getString(PRESETS_DEFAULT)) || (upper_name == PRESETS_DEFAULT_UPPER)) { LLNotificationsUtil::add("DefaultPresetNotSaved"); } |