merge

indra/llcommon/llfasttimer.cpp

indra/llcommon/llfasttimer.h

indra/llcommon/lltrace.h

indra/llcommon/lltracerecording.cpp

indra/llcommon/lltracerecording.h

indra/llcommon/lltracethreadrecorder.cpp

indra/llmath/llcamera.cpp

indra/llmath/llcamera.h

indra/llui/llui.cpp

indra/llui/llui.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

..._settings/shaders/class1/interface/onetexturefilterF.glsl

..._settings/shaders/class1/interface/onetexturefilterV.glsl

...settings/shaders/class1/interface/twotexturecompareF.glsl

...settings/shaders/class1/interface/twotexturecompareV.glsl

indra/newview/llappviewer.cpp

indra/newview/lldebugview.cpp

indra/newview/lldrawable.cpp

indra/newview/lldrawable.h