merge

indra/llrender/llfontgl.cpp

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llui/lltabcontainer.cpp

indra/llui/llui.cpp

indra/llui/llviewborder.cpp

indra/llui/llviewborder.h

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/lldrawable.cpp

indra/newview/llflexibleobject.cpp

indra/newview/llglsandbox.cpp

indra/newview/llhudrender.cpp

indra/newview/llhudtext.cpp

indra/newview/llmediactrl.cpp

indra/newview/llnetmap.cpp

indra/newview/llviewercontrol.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewerobjectlist.cpp