merge

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llinventory/CMakeLists.txt

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorydefines.cpp

indra/llinventory/llinventorydefines.h

indra/llinventory/llinventorytype.h

indra/llmessage/message_prehash.cpp

indra/llui/llaccordionctrl.cpp

indra/llui/llscrollingpanellist.cpp

indra/llui/llscrollingpanellist.h

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llurlregistry.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llagentwearablesfetch.cpp

indra/newview/llagentwearablesfetch.h

indra/newview/llappearancemgr.cpp