# Conflicts: # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml