merge

indra/llcommon/llformat.cpp

indra/llcommon/llformat.h

indra/llcommon/llstring.cpp

indra/llcommon/llstring.h

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llrender/llimagegl.cpp

indra/llui/llcheckboxctrl.cpp

indra/llui/llresmgr.cpp

indra/newview/llagent.cpp

indra/newview/llagentcamera.cpp

indra/newview/lldynamictexture.cpp

indra/newview/llinventorylistitem.cpp

indra/newview/lllogininstance.cpp

indra/newview/llpanelgrouproles.cpp

indra/newview/llpanelplaceinfo.cpp

indra/newview/lltexlayerparams.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewerinventory.cpp

indra/newview/llviewermessage.cpp