Merge from default branch

indra/llui/lldockablefloater.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llfloatergodtools.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/llinventorybridge.cpp

indra/newview/lllocationinputctrl.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llpreviewscript.cpp

indra/newview/lltoolpie.cpp

indra/newview/llviewermenu.cpp

indra/newview/llvoiceclient.cpp

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

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

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

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

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

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

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

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

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