merge

indra/llplugin/llpluginprocesschild.cpp

indra/llwindow/llkeyboardwin32.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

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/lltoolpie.cpp

indra/newview/llvovolume.cpp

.../newview/skins/default/xui/en/panel_outfits_inventory.xml

...ewview/skins/default/xui/en/panel_preferences_privacy.xml

...ewview/skins/default/xui/en/panel_prim_media_controls.xml