Merged lindenlab/viewer-cat into default

indra/llcommon/llmemory.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llrender/llgl.cpp

indra/llrender/llglheaders.h

indra/llrender/llimagegl.cpp

indra/llrender/llrender.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/newview/app_settings/shaders/class1/deferred/giF.glsl

.../newview/app_settings/shaders/class1/deferred/waterF.glsl

.../app_settings/shaders/class1/environment/underWaterF.glsl

...wview/app_settings/shaders/class1/environment/waterF.glsl

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappviewer.cpp

indra/newview/lldrawable.cpp

indra/newview/lldrawpool.cpp