diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-27 19:54:10 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-27 19:54:10 +0100 |
| commit | a84ee929a5221aec07bcc93815ca6c57bb8ab6bb (patch) | |
| tree | ecf9694b9e772161b67c8b0935362b0e05cc7c7d /indra/newview/llpresetsmanager.cpp | |
| parent | 4d4255c27b45ed5e32fe7c4870e2ce3ed10cb140 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpresetsmanager.cpp')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 96818d5a21..df93572508 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -138,6 +138,11 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n { name = PRESETS_DEFAULT; } + if (!createDefault && name == PRESETS_DEFAULT) + { + LL_WARNS() << "Should not overwrite default" << LL_ENDL; + return false; + } bool saved = false; std::vector<std::string> name_list; |