# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/de/menu_viewer.xml