Merge branch 'next' into merge/materials_featurette

indra/llmath/llvolume.cpp

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

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

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

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

...wview/skins/default/xui/ja/floater_adjust_environment.xml

...w/skins/default/xui/ja/floater_animation_anim_preview.xml

...ew/skins/default/xui/ja/floater_animation_bvh_preview.xml

indra/newview/skins/default/xui/ja/floater_ao.xml

indra/newview/skins/default/xui/ja/floater_avatar_picker.xml

indra/newview/skins/default/xui/ja/floater_beacons.xml

indra/newview/skins/default/xui/ja/floater_build_options.xml

indra/newview/skins/default/xui/ja/floater_bulk_perms.xml

indra/newview/skins/default/xui/ja/floater_buy_object.xml

indra/newview/skins/default/xui/ja/floater_camera.xml

indra/newview/skins/default/xui/ja/floater_chatbar.xml

indra/newview/skins/default/xui/ja/floater_clear_cache.xml

indra/newview/skins/default/xui/ja/floater_color_picker.xml

.../newview/skins/default/xui/ja/floater_create_landmark.xml

indra/newview/skins/default/xui/ja/floater_critical.xml