svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6

indra/lib/python/indra/util/llmanifest.py

indra/llcommon/lluri.cpp

indra/llcommon/lluri.h

indra/newview/linux_tools/handle_secondlifeprotocol.sh

indra/newview/linux_tools/register_secondlifeprotocol.sh

indra/newview/linux_tools/wrapper.sh

indra/newview/llcommandhandler.cpp

indra/newview/llcommandhandler.h

indra/newview/llfloaterevent.cpp

indra/newview/llfloaterparcel.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h

indra/newview/llstartup.cpp

indra/newview/lltoolpie.cpp

indra/newview/llurldispatcher.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermenu.h

indra/newview/llviewerwindow.cpp