From b778abe02b80d68ea0894f237c001e8a5505cc13 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 30 Jan 2018 09:21:14 -0500 Subject: disambiguate boost list assignment by using a const for the value --- indra/newview/llpresetsmanager.cpp | 6 ++++-- 1 file 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& names) { - names = boost::assign::list_of + const std::vector camera_controls = boost::assign::list_of // From panel_preferences_move.xml ("CameraAngle") ("CameraOffsetScale") @@ -225,7 +225,9 @@ void LLPresetsManager::getControlNames(std::vector& names) ("CameraOffsetRearView") ("FocusOffsetRearView") ("CameraOffsetScale") - ("TrackFocusObject"); + ("TrackFocusObject") + ; + names = camera_controls; } bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string name, bool createDefault) -- cgit v1.2.3