# Conflicts: # indra/llcommon/llstring.h # indra/newview/llviewermenu.cpp # indra/newview/llviewerregion.cpp