Redo Bao's broken merge

indra/llcommon/CMakeLists.txt

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/llfoldertype.cpp

indra/llcommon/llfoldertype.h

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/llinventory/tests/inventorymisc_test.cpp

indra/llmessage/lltransfersourceasset.cpp

indra/llprimitive/llmediaentry.cpp

indra/llprimitive/tests/llmediaentry_test.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/foldertypes.xml

indra/newview/llagentpicksinfo.cpp

indra/newview/llagentui.cpp