Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltextbox.cpp

indra/llui/lltextbox.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/lluicolortable.cpp

indra/newview/CMakeLists.txt

indra/newview/llchathistory.cpp

indra/newview/llchathistory.h

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llchatitemscontainerctrl.h

indra/newview/llchatmsgbox.cpp

indra/newview/llchatmsgbox.h

indra/newview/llexpandabletextbox.cpp

indra/newview/llexpandabletextbox.h

indra/newview/llimfloater.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h