automated merge

indra/llaudio/llwindgen.h

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llloadingindicator.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/llui.cpp

indra/llui/lluictrl.h

indra/llui/lluictrlfactory.cpp

indra/llui/lluictrlfactory.h

indra/newview/llcofwearables.cpp

indra/newview/lloutfitslist.cpp

indra/newview/lloutfitslist.h

indra/newview/llscrollingpanelparam.cpp

indra/newview/llsidepanelappearance.cpp

indra/newview/lltexturectrl.cpp

indra/newview/skins/default/xui/en/floater_about_land.xml

indra/newview/skins/default/xui/en/panel_cof_wearables.xml

indra/newview/skins/default/xui/en/sidepanel_appearance.xml

indra/newview/skins/default/xui/en/widgets/textbase.xml