merge

indra/llrender/llfontgl.cpp

indra/llui/llscrollcontainer.cpp

indra/llui/lltextbase.cpp

indra/llui/llui.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowheadless.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/llwindow/llwindowmesaheadless.h

indra/llwindow/llwindowsdl.cpp

indra/llwindow/llwindowsdl.h

indra/llwindow/llwindowwin32.cpp

indra/llwindow/llwindowwin32.h

indra/newview/app_settings/settings.xml

indra/newview/llfloateranimpreview.cpp

indra/newview/llfloateranimpreview.h

indra/newview/llfolderviewitem.cpp

indra/newview/llfolderviewitem.h

indra/newview/lllocationinputctrl.cpp

indra/newview/llloginhandler.cpp