Automated merge of ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llfloatertools.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llfolderviewitem.cpp

indra/newview/llfolderviewitem.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h

indra/newview/llinventoryobserver.cpp

indra/newview/llinventoryobserver.h

indra/newview/llinventorypanel.cpp