merge

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/llurlregistry.cpp

indra/llui/llurlregistry.h

indra/newview/CMakeLists.txt

...view/app_settings/shaders/class2/deferred/blurLightF.glsl

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/llagentwearables.cpp

indra/newview/llavatarlist.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llchiclet.cpp

indra/newview/llchiclet.h

indra/newview/llcommanddispatcherlistener.cpp