PE merge

indra/newview/llfolderviewitem.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llvoavatarself.cpp

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

...newview/skins/default/xui/en/panel_preferences_alerts.xml

...ewview/skins/default/xui/en/panel_preferences_general.xml

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