Merge with latest

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/stdenums.h

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/llui/CMakeLists.txt

indra/llui/llclipboard.cpp

indra/llui/llclipboard.h

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llui/llui.h

indra/llxuixml/llinitparam.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/toolbars.xml

indra/newview/lltoolbarview.cpp

indra/newview/lltoolbarview.h

indra/newview/lltooldraganddrop.cpp

indra/newview/lltooldraganddrop.h

indra/newview/llviewerassettype.cpp

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