merge

indra/llui/llmenugl.cpp

indra/llui/llpanel.cpp

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/app_settings/settings.xml

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llfloatercamera.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llpanellogin.cpp

indra/newview/llsidetray.cpp

indra/newview/lltool.cpp

indra/newview/lltoolpie.cpp

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

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

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

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

indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml