Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llcommandmanager.cpp

indra/llui/llcommandmanager.h

indra/llui/llflashtimer.cpp

indra/llui/llflashtimer.h

indra/llui/llfolderviewitem.cpp

indra/llui/llfolderviewitem.h

indra/llui/lltabcontainer.cpp

indra/llui/lltoolbar.cpp

indra/newview/app_settings/commands.xml

indra/newview/llconversationview.cpp

indra/newview/llconversationview.h

indra/newview/llfloaterimcontainer.cpp