merge

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llinventory/llinventorytype.h

indra/newview/llagentwearables.h

indra/newview/llagentwearablesfetch.cpp

indra/newview/llagentwearablesfetch.h

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llfolderview.cpp

indra/newview/llfoldervieweventlistener.h

indra/newview/llfolderviewitem.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryfunctions.h

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelobjectinventory.cpp

indra/newview/llpaneloutfitsinventory.cpp