Merge

indra/newview/llfloaterpreference.cpp

indra/newview/llfolderviewitem.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llpanelobjectinventory.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerparcelmedia.cpp

indra/newview/llviewerparcelmediaautoplay.cpp

indra/newview/llvoavatarself.cpp

indra/newview/llworld.cpp

indra/newview/res-sdl/ll_icon.BMP

indra/newview/res/ll_icon.png

indra/newview/skins/default/textures/icons/SL_Logo.png

indra/newview/skins/default/xui/en/floater_preferences.xml

indra/newview/skins/default/xui/en/floater_tools.xml

...a/newview/skins/default/xui/en/panel_avatar_list_item.xml

...wview/skins/default/xui/en/panel_preferences_advanced.xml