merge

.hgtags

indra/llimage/llimagefilter.cpp

indra/llprimitive/llmodel.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llvertexbuffer.cpp

indra/newview/VIEWER_VERSION.txt

indra/newview/llfeaturemanager.cpp

indra/newview/llfeaturemanager.h

indra/newview/llflickrconnect.cpp

indra/newview/llfloatergroupbulkban.cpp

indra/newview/llglsandbox.cpp

indra/newview/lllogchat.cpp

indra/newview/llpanelgroupbulk.cpp

indra/newview/llpanelgroupinvite.cpp

indra/newview/lltwitterconnect.cpp