# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfilepicker.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelwearing.cpp # indra/newview/llvovolume.cpp