merge changes for DRTVWR-148

.hgtags

indra/linux_updater/linux_updater.cpp

indra/llimage/llimagej2c.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llprimitive/llprimitive.cpp

indra/llrender/llgl.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llrender/llrendertarget.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llcontainerview.cpp

indra/llui/llmultifloater.cpp

indra/llvfs/lldir.cpp

indra/llwindow/llwindowwin32.cpp

indra/mac_updater/mac_updater.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml