Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175

indra/llcommon/llinitparam.h

indra/llcommon/llregistry.h

indra/llcommon/llstl.h

indra/llui/llfloater.cpp

indra/llui/llradiogroup.cpp

indra/llui/llrngwriter.cpp

indra/llui/llscrolllistcolumn.cpp

indra/llui/lltextbase.cpp

indra/llui/lltooltip.cpp

indra/llui/lluictrlfactory.cpp

indra/llui/lluictrlfactory.h

indra/llui/llxuiparser.cpp

indra/llui/llxuiparser.h

indra/newview/llavatarlistitem.cpp

indra/newview/llinventorylistitem.cpp

indra/newview/llwearableitemslist.cpp