Merge from default branch

indra/llui/lltextbase.cpp

indra/newview/llappviewer.cpp

indra/newview/llpanelplaces.cpp

indra/newview/llsidepaneltaskinfo.h

indra/newview/llsurface.cpp

indra/newview/llviewerstats.h

indra/newview/llviewertexturelist.cpp

indra/newview/llvograss.cpp

indra/newview/llvotree.cpp

indra/newview/llvotree.h

indra/newview/llwearableitemslist.cpp

...kins/default/xui/fr/floater_inventory_item_properties.xml

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

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

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

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

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

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

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

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