Pull merge from richard/viewer-chui.

indra/llcharacter/llanimationstates.cpp

indra/llcharacter/llanimationstates.h

indra/llmessage/lldbstrings.h

indra/llmessage/llinstantmessage.cpp

indra/llmessage/llinstantmessage.h

indra/newview/app_settings/settings_per_account.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappearancemgr.cpp

indra/newview/llavataractions.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llimconversation.cpp

indra/newview/llimfloatercontainer.cpp

indra/newview/llimfloatercontainer.h

indra/newview/llimview.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

indra/newview/llnearbychathandler.cpp