merge

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/llcloud.cpp

indra/newview/llsidepaneltaskinfo.cpp

indra/newview/llsidepaneltaskinfo.h

indra/newview/llviewerwindow.cpp

indra/newview/llworld.cpp

indra/newview/llworld.h

indra/newview/llworldview.cpp

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

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

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

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

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

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

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

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