Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llui/llnotifications.cpp

indra/llui/lluictrlfactory.cpp

indra/llui/lluictrlfactory.h

indra/llxuixml/llinitparam.h

indra/llxuixml/llregistry.h

indra/newview/CMakeLists.txt

indra/newview/llavataractions.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfavoritesbar.h

indra/newview/llfloateroutbox.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llfoldervieweventlistener.h

indra/newview/llfolderviewitem.cpp

indra/newview/llfolderviewitem.h

indra/newview/llfolderviewmodel.h

indra/newview/llfriendcard.cpp

indra/newview/llinventorybridge.cpp