merge

indra/llui/lllocalcliprect.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/llexpandabletextbox.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llpanelplaceprofile.cpp

indra/newview/llparticipantlist.cpp

indra/newview/llviewertexteditor.cpp

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

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

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

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

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

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

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

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

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

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

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

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