merge changes for storm-1571

indra/llcommon/llerror.cpp

indra/llcommon/llerror.h

indra/llcommon/llsingleton.h

indra/llmessage/CMakeLists.txt

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/llhttpassetstorage.cpp

indra/llmessage/llhttpclient.cpp

indra/llmessage/lliosocket.cpp

indra/llmessage/lliosocket.h

indra/llmessage/llpacketring.cpp

indra/llmessage/llpacketring.h

indra/llmessage/llproxy.cpp

indra/llmessage/llproxy.h

indra/llmessage/llurlrequest.cpp

indra/llmessage/net.cpp

indra/llmessage/net.h

indra/llui/llfunctorregistry.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp