Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951

indra/llui/llfloaterreg.cpp

indra/llui/llnotifications.cpp

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/newview/llagent.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llviewercontrol.cpp

indra/newview/tests/llagentaccess_test.cpp

indra/newview/tests/lllogininstance_test.cpp

indra/newview/tests/llsecapi_test.cpp

indra/newview/tests/llsechandler_basic_test.cpp

indra/newview/tests/llslurl_test.cpp

indra/newview/tests/llviewerhelputil_test.cpp

indra/newview/tests/llviewernetwork_test.cpp

indra/newview/tests/llxmlrpclistener_test.cpp