Merge

indra/llplugin/llpluginprocesschild.cpp

indra/llwindow/llkeyboardwin32.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfolderview.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h

indra/newview/llpaneloutfitsinventory.cpp

indra/newview/llsidepanelappearance.cpp

indra/newview/llsidepanelappearance.h

indra/newview/lltoolpie.cpp

indra/newview/llvovolume.cpp

indra/newview/skins/default/colors.xml

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