Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.

indra/llcommon/llerror.cpp

indra/llcommon/llerror.h

indra/llcommon/llerrorcontrol.h

indra/newview/llfloaterpreference.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h

indra/newview/llslurl.cpp

indra/newview/llslurl.h

indra/newview/llstartup.cpp

indra/newview/llviewernetwork.cpp

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

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

indra/newview/tests/llslurl_test.cpp

indra/test/test.cpp