Conflicts: indra/newview/llnetmap.cpp indra/newview/llnetmap.h indra/newview/skins/default/xui/en-us/menu_mini_map.xml