merge

indra/newview/llfloatertools.cpp

indra/newview/llfloatertools.h

indra/newview/llpanelprimmediacontrols.cpp

indra/newview/llviewermediafocus.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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