merge.

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/llui/llmenubutton.cpp

indra/llui/lltextbase.cpp

indra/llui/lltooltip.cpp

indra/llui/lltooltip.h

indra/newview/llchathistory.cpp

indra/newview/llchathistory.h

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llexpandabletextbox.cpp

indra/newview/llimfloater.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llmanip.cpp

indra/newview/llnamelistctrl.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnearbychathandler.cpp