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/newview/CMakeLists.txt

indra/newview/app_settings/foldertypes.xml

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llassetuploadresponders.cpp

indra/newview/llavataractions.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfloateranimpreview.cpp

indra/newview/llfloaterbulkpermission.cpp