merge

.hgtags

autobuild.xml

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llimage/llimagej2c.cpp

indra/llkdu/llimagej2ckdu.cpp

indra/llkdu/llimagej2ckdu.h

indra/llkdu/llkdumem.h

indra/llkdu/tests/llimagej2ckdu_test.cpp

indra/llmessage/llavatarnamecache.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llui/llcontainerview.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml