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

indra/llcommon/llinitparam.cpp

indra/llcommon/llinitparam.h

indra/llcommon/llsdparam.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationloglist.cpp

indra/newview/llconversationloglist.h

indra/newview/llconversationloglistitem.cpp

indra/newview/llconversationloglistitem.h

indra/newview/llfloaterconversationlog.cpp

indra/newview/llfloaterconversationlog.h

indra/newview/llfloaterconversationpreview.cpp

indra/newview/llfloaterconversationpreview.h

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimview.cpp