merge

.hgtags

BuildParams

autobuild.xml

doc/contributions.txt

indra/llcommon/tests/llleap_test.cpp

indra/llcorehttp/CMakeLists.txt

indra/llmessage/llassetstorage.cpp

indra/llmessage/llassetstorage.h

indra/llmessage/llhttpassetstorage.cpp

indra/llmessage/lltransfertargetvfile.cpp

indra/llmessage/lltransfertargetvfile.h

indra/llprimitive/lldaeloader.cpp

indra/llprimitive/lldaeloader.h

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llui/lliconctrl.cpp

indra/llui/lliconctrl.h

indra/llui/lltextbase.cpp