Merge with another head in branch

indra/llui/lluictrlfactory.h

indra/newview/app_settings/settings.xml

indra/newview/llchiclet.cpp

indra/newview/llfolderview.h

indra/newview/lllocationinputctrl.cpp

indra/newview/llpanelgenerictip.cpp

indra/newview/llpanelonlinestatus.cpp

indra/newview/llscriptfloater.cpp

indra/newview/llscriptfloater.h

indra/newview/llsyswellwindow.cpp

indra/newview/lltexturectrl.cpp

indra/newview/llurllineeditorctrl.cpp

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