Conflicts: indra/llvfs/lldiriterator.cpp indra/newview/app_settings/settings.xml indra/newview/llviewerregion.cpp