# Conflicts: # indra/newview/llfloatermarketplace.cpp # indra/newview/llviewermessage.cpp # indra/newview/skins/default/xui/en/panel_preferences_move.xml