diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
| commit | a3066b7375a13b61861b554519673dfc24322c22 (patch) | |
| tree | 9b3d61c932ff8a88e5a2384f138e7ed9b83248ac /indra/newview/llpresetsmanager.cpp | |
| parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
| parent | 124d8c8dce3a5da8aa73f12f8733c65f57479a24 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpresetsmanager.cpp')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index f40b3e0295..76d721ecdc 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -165,8 +165,8 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n } else if(PRESETS_CAMERA == subdirectory) { - name_list = boost::assign::list_of - ("Placeholder"); + name_list.clear(); + name_list.push_back("Placeholder"); } else { |