merge

.hgtags

build.sh

doc/contributions.txt

indra/llcommon/llapp.cpp

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/llqueuedthread.cpp

indra/llcommon/llthread.cpp

indra/llcommon/llthread.h

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llmath/lloctree.h

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/tests/llcurl_stub.cpp

indra/llmessage/tests/llhttpclient_test.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llrender/llvertexbuffer.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml