merge

indra/llrender/llgl.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltextbase.cpp

indra/newview/llchiclet.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimsession.cpp

indra/newview/llimview.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llworldmapview.cpp

...iew/skins/default/textures/icons/collapse_to_one_line.png

...newview/skins/default/textures/icons/expand_one_liner.png

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