Merge

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/lltoolbar.cpp

indra/newview/app_settings/settings.xml

indra/newview/llfloatertoybox.cpp

indra/newview/llmoveview.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/skins/default/textures/navbar/separator.png

indra/newview/skins/default/textures/textures.xml

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

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

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

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

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