livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disambiguate boost list assignment by using a const for the value

meow-7.2.2
Oz Linden 2018-01-30 09:21:14 -05:00
parent 0cde8e8858
commit b778abe02b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpresetsmanager.cpp
View File

@ -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)