merge

indra/cmake/LLKDU.cmake

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/llui/lluicolortable.cpp

indra/llui/lluicolortable.h

indra/newview/CMakeLists.txt

indra/newview/llagentwearables.cpp

indra/newview/llcapabilitylistener.cpp

indra/newview/llcapabilitylistener.h

indra/newview/llcapabilityprovider.h

indra/newview/llface.inl

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloaterregioninfo.h

indra/newview/llpanelmediasettingsgeneral.cpp

indra/newview/llpanelmediasettingsgeneral.h

indra/newview/llsidetray.cpp

indra/newview/llsidetray.h

indra/newview/llviewerparcelmgr.cpp

indra/newview/llviewerparcelmgr.h