merge changes for vmrg-204

indra/llcommon/llmemory.cpp

indra/llimage/llimage.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/llurlrequest.cpp

indra/llplugin/llpluginmessagepipe.cpp

indra/llplugin/llpluginmessagepipe.h

indra/llprimitive/lltextureanim.cpp

indra/llprimitive/llvolumexml.cpp

indra/llprimitive/llvolumexml.h

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llshadermgr.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/llui.cpp

indra/llxml/llxmlnode.cpp

indra/llxuixml/llxuiparser.cpp

indra/newview/app_settings/settings.xml

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl