merge from viewer-2-0

indra/llimage/llimage.cpp

indra/newview/lltexlayer.cpp

indra/newview/lltexturecache.cpp

indra/newview/lltoolpie.cpp

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

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

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

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

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

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

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

...a/newview/skins/default/xui/fr/panel_preferences_chat.xml

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

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