merge

indra/llui/llcommandmanager.cpp

indra/llui/llcommandmanager.h

indra/llui/llfloater.cpp

indra/llui/llnotifications.cpp

indra/llui/llsdparam.cpp

indra/llui/llsdparam.h

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llui/tests/llurlentry_stub.cpp

indra/llui/tests/llurlentry_test.cpp

indra/llui/tests/llurlmatch_test.cpp

indra/llxuixml/llinitparam.cpp

indra/llxuixml/llinitparam.h

indra/llxuixml/llxuiparser.cpp

indra/llxuixml/llxuiparser.h

indra/newview/app_settings/commands.xml

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappviewer.cpp