automated merge

indra/llplugin/slplugin/CMakeLists.txt

indra/llplugin/slplugin/slplugin-objc.h

indra/llplugin/slplugin/slplugin-objc.mm

indra/llplugin/slplugin/slplugin.cpp

indra/llwindow/llwindowmacosx-objc.mm

indra/newview/llfloaterpay.cpp

indra/newview/llinspecttoast.cpp

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryfunctions.h

indra/newview/llpaneloutfitedit.cpp

indra/newview/llsidepanelappearance.cpp

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

.../newview/skins/default/xui/de/floater_preview_gesture.xml

indra/newview/skins/default/xui/de/floater_snapshot.xml

indra/newview/skins/default/xui/de/floater_voice_effect.xml

indra/newview/skins/default/xui/de/menu_attachment_self.xml

indra/newview/skins/default/xui/de/menu_outfit_tab.xml

indra/newview/skins/default/xui/de/menu_topinfobar.xml

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

.../newview/skins/default/xui/de/menu_wearable_list_item.xml