merge

indra/llui/lllineeditor.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/app_settings/settings.xml

indra/newview/llfoldervieweventlistener.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventorypanel.cpp

indra/newview/lltoolpie.cpp

indra/newview/llviewermenu.cpp

indra/newview/skins/default/colors.xml

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

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

indra/newview/skins/default/textures/windows/Inspector_I.png

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

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

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

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

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

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

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