Pull merge from lindenlab/viewer-chui

.hgtags

doc/contributions.txt

indra/llcommon/llversionviewer.h

indra/llui/lltextbase.cpp

indra/llui/llurlaction.cpp

indra/llui/llurlaction.h

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationview.cpp

indra/newview/lldrawable.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychat.h

indra/newview/llfloaterimsession.h

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h