automated merge

indra/newview/lloutfitslist.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewertexturelist.cpp

.../newview/skins/default/xui/da/floater_preview_gesture.xml

indra/newview/skins/default/xui/da/floater_world_map.xml

indra/newview/skins/default/xui/da/menu_viewer.xml

indra/newview/skins/default/xui/da/notifications.xml

indra/newview/skins/default/xui/da/panel_group_notices.xml

indra/newview/skins/default/xui/da/panel_group_roles.xml

indra/newview/skins/default/xui/da/panel_nearby_media.xml

.../newview/skins/default/xui/da/panel_preferences_sound.xml

...a/newview/skins/default/xui/da/panel_teleport_history.xml

indra/newview/skins/default/xui/da/sidepanel_item_info.xml

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

.../newview/skins/default/xui/de/floater_preview_gesture.xml

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

indra/newview/skins/default/xui/fr/floater_about_land.xml

...ewview/skins/default/xui/fr/floater_day_cycle_options.xml

indra/newview/skins/default/xui/fr/floater_postcard.xml

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