Merge branch 'lindenlab/viewer-eep' into viewer/eep

indra/llinventory/llsettingsbase.cpp

indra/llinventory/llsettingsbase.h

indra/llinventory/llsettingsdaycycle.cpp

indra/llinventory/llsettingsdaycycle.h

indra/llmath/llmath.h

indra/llmath/v3color.h

indra/llmath/v4color.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llrender/llrender.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

...iew/app_settings/shaders/class1/deferred/fullbrightF.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyV.glsl

...wview/app_settings/shaders/class1/deferred/materialF.glsl

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl

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

...pp_settings/shaders/class1/environment/terrainWaterF.glsl