Merge with dessie/viewer-public to get Callum's webkit changes

indra/llui/lltextbase.cpp

indra/llui/llview.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

indra/newview/gpu_table.txt

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llcofwearables.cpp

indra/newview/llcofwearables.h

indra/newview/llfloateruipreview.cpp

indra/newview/llinventorybridge.cpp