diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-30 09:21:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-30 09:21:14 -0500 |
| commit | b778abe02b80d68ea0894f237c001e8a5505cc13 (patch) | |
| tree | 6b8db65f69850311c139f78b07c87d7ab3e2bd66 /indra/newview/llpresetsmanager.cpp | |
| parent | 0cde8e88586a4a9cde8a1c91a71882c8fffa8c93 (diff) | |
disambiguate boost list assignment by using a const for the value
Diffstat (limited to 'indra/newview/llpresetsmanager.cpp')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index e0fa085658..52964a125f 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -214,7 +214,7 @@ void LLPresetsManager::settingChanged() void LLPresetsManager::getControlNames(std::vector<std::string>& names) { - names = boost::assign::list_of + const std::vector<std::string> camera_controls = boost::assign::list_of // From panel_preferences_move.xml ("CameraAngle") ("CameraOffsetScale") @@ -225,7 +225,9 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names) ("CameraOffsetRearView") ("FocusOffsetRearView") ("CameraOffsetScale") - ("TrackFocusObject"); + ("TrackFocusObject") + ; + names = camera_controls; } bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string name, bool createDefault) |