Merge with tip (another one)

indra/newview/llselectmgr.cpp

indra/newview/llviewerobject.cpp

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

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

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

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

indra/newview/skins/default/xui/it/floater_about.xml

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

...ewview/skins/default/xui/it/floater_animation_preview.xml

.../newview/skins/default/xui/it/floater_avatar_textures.xml

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

indra/newview/skins/default/xui/it/floater_buy_currency.xml

indra/newview/skins/default/xui/it/floater_buy_land.xml

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

indra/newview/skins/default/xui/it/floater_customize.xml

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

indra/newview/skins/default/xui/it/floater_god_tools.xml

indra/newview/skins/default/xui/it/floater_help_browser.xml

indra/newview/skins/default/xui/it/floater_im.xml

indra/newview/skins/default/xui/it/floater_im_container.xml