Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics

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

indra/newview/llfasttimerview.cpp

indra/newview/llscenemonitor.cpp

indra/newview/llscenemonitor.h

indra/newview/llspatialpartition.cpp

indra/newview/llspatialpartition.h

indra/newview/lltexturefetch.cpp