merge

indra/llcommon/llpointer.h

indra/llcommon/llrefcount.cpp

indra/llcommon/llrefcount.h

indra/llui/llspinctrl.cpp

indra/llui/llspinctrl.h

indra/llui/llstyle.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/llui.cpp

indra/llui/lluicolortable.h

indra/llui/lluiimage.cpp

indra/llxuixml/llinitparam.cpp

indra/llxuixml/llinitparam.h

indra/llxuixml/lluicolor.cpp

indra/llxuixml/lluicolor.h

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llchathistory.cpp