merge, conflicts in llvertexbuffer.{h,cpp}

.hgtags

indra/llcommon/llthread.cpp

indra/llcommon/llthread.h

indra/llcommon/llversionviewer.h

indra/llmessage/llbuffer.cpp

indra/llmessage/llbuffer.h

indra/llmessage/llbufferstream.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/llhttpassetstorage.cpp

indra/llmessage/llhttpclient.cpp

indra/llmessage/lliohttpserver.cpp

indra/llmessage/lliopipe.cpp

indra/llmessage/lliopipe.h

indra/llmessage/lliosocket.cpp

indra/llmessage/llpumpio.cpp

indra/llmessage/llpumpio.h

indra/llmessage/llsdrpcclient.h

indra/llmessage/llurlrequest.cpp

indra/llmessage/llurlrequest.h