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

indra/llui/llfolderviewitem.cpp

indra/newview/llconversationview.cpp

indra/newview/llconversationview.h

indra/newview/llimconversation.cpp

indra/newview/llimconversation.h

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimfloatercontainer.h

indra/newview/llimview.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

indra/newview/llspeakers.cpp

indra/newview/llvoicevivox.cpp

indra/newview/llvoicevivox.h

.../skins/default/textures/icons/Conv_toolbar_add_person.png

...ew/skins/default/textures/icons/Conv_toolbar_arrow_ne.png

...ew/skins/default/textures/icons/Conv_toolbar_arrow_sw.png

...wview/skins/default/textures/icons/Conv_toolbar_close.png

...ew/skins/default/textures/icons/Conv_toolbar_collapse.png