merge

indra/llui/llcommandmanager.cpp

indra/llui/llcommandmanager.h

indra/llui/lldockablefloater.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llxuixml/llinitparam.h

indra/newview/app_settings/commands.xml

indra/newview/llagent.cpp

indra/newview/lldebugview.cpp

indra/newview/lldebugview.h

indra/newview/llfloatertoybox.cpp

indra/newview/llfloatertoybox.h

indra/newview/llnearbychatbar.cpp

indra/newview/lltoolbarview.cpp

indra/newview/lltoolbarview.h

indra/newview/lltoolmgr.cpp

indra/newview/llviewerwindow.cpp