merge

indra/llui/llbutton.cpp

indra/llui/llcommandmanager.cpp

indra/llui/llcommandmanager.h

indra/llui/lldockcontrol.cpp

indra/llui/llmenugl.cpp

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llui/lltoolbarview.cpp

indra/llui/lltoolbarview.h

indra/llui/llui.cpp

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/app_settings/commands.xml

indra/newview/app_settings/settings.xml

indra/newview/llfavoritesbar.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatertoybox.cpp

indra/newview/llfolderview.cpp

indra/newview/llgrouplist.cpp

indra/newview/llpanelpeople.cpp