Merge from default branch

indra/llcommon/llapr.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelpick.cpp

indra/newview/llpanelplace.cpp

indra/newview/llpanelplaceinfo.cpp

indra/newview/llpanelprimmediacontrols.cpp

indra/newview/lltexturecache.cpp

indra/newview/lltexturecache.h

indra/newview/lltoolpie.cpp

indra/newview/llviewermedia.cpp

indra/newview/llvoavatar.cpp

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

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

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