Conflicts: indra/newview/llpaneldisplay.cpp indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml