automated merge

indra/llcommon/lluri.cpp

indra/llcommon/lluuid.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/llhttpclient.cpp

indra/llmessage/llhttpclient.h

indra/llmessage/llurlrequest.cpp

indra/llmessage/llurlrequest.h

indra/llui/llurlentry.cpp

indra/llui/tests/llurlentry_test.cpp

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/newview/CMakeLists.txt

indra/newview/Info-SecondLife.plist

indra/newview/app_settings/settings.xml

indra/newview/installers/windows/installer_template.nsi

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentlistener.cpp

indra/newview/llagentui.cpp