Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and socks5.h.

indra/llmessage/CMakeLists.txt

indra/llmessage/llcurl.cpp

indra/llmessage/llpacketring.cpp

indra/llmessage/llpacketring.h

indra/llmessage/llsocks5.cpp

indra/llmessage/llsocks5.h

indra/llmessage/net.cpp

indra/llmessage/net.h

indra/newview/app_settings/settings.xml

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llstartup.cpp

indra/newview/llstartup.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llxmlrpctransaction.cpp

...ewview/skins/default/xui/en/floater_preferences_proxy.xml

indra/newview/skins/default/xui/en/notifications.xml

.../newview/skins/default/xui/en/panel_preferences_setup.xml