Merge

indra/llcharacter/llkeyframemotion.cpp

indra/llcommon/llsdserialize.cpp

indra/llcommon/llsdserialize.h

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/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llmessage/llcurl.cpp

indra/llmessage/message_prehash.cpp

indra/llplugin/llplugincookiestore.cpp

indra/llplugin/tests/llplugincookiestore_test.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llimagegl.cpp