diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-08 10:05:15 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-08 10:05:15 -0400 |
commit | ccc42830ee51e4721e6fb9f09ca6953672de7f53 (patch) | |
tree | 0c7532d0affa61d62efcd7f93df0ab3e89f5a544 /indra | |
parent | 93029a5a66f6797391a86affa40eb6185e291efc (diff) |
DRTVWR-418: Fix vector assignment for C++03.
For the time being we're still compiling for production with C++03. Although
assigning an initializer list to a vector is valid C++11, in C++03 mode clang
rejects it.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpresetsmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 214d221716..76d721ecdc 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -165,7 +165,8 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n } else if(PRESETS_CAMERA == subdirectory) { - name_list = {"Placeholder"}; + name_list.clear(); + name_list.push_back("Placeholder"); } else { |