merge

indra/llrender/llvertexbuffer.cpp

indra/newview/CMakeLists.txt

indra/newview/llbottomtray.cpp

indra/newview/llchathistory.cpp

indra/newview/lldrawpoolwlsky.cpp

indra/newview/lldrawpoolwlsky.h

indra/newview/llfloaterchat.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimfloatercontainer.h

indra/newview/llinspecttoast.cpp

indra/newview/llinspecttoast.h

indra/newview/llnearbychatbar.cpp

indra/newview/llpanelgroup.cpp

indra/newview/llpanelgroup.h

indra/newview/llscreenchannel.cpp

indra/newview/llscreenchannel.h

indra/newview/llsidetray.cpp

indra/newview/llsyswellitem.cpp